BZ-13007 Markup Changes
Merge branch 'EBP_Flow_Improvements' of https://github.com/NoesisEnergy/bootstrap into EBP_Flow_Improvements

Conflicts:
	src/main/js/noesis/bootstrap/projects/directives/addECM.html