BZ-11111: Fix validation that cause energy saving get deleted
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap