Merge branch 'GONRG-9619-Incorrect_var_ENT_bootstrap' into 'master'
Gonrg 9619 incorrect var ent bootstrap
See merge request !1466
(cherry picked from commit 54662af8)
7b0b8c9c Removing unused service SA
fca388cd Removing unused service SA
f340ba60 Fix fmt