BZ-12264:ECM Wizard Improvements
Merge branch 'EBP_Flow_Improvements' of https://github.com/NoesisEnergy/bootstrap into EBP_Flow_Improvements

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'remotes/origin/EBP_Flow_Improvements' into integration