BZ-11929: Fix the placeholder characters in the resulting image
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap

Conflicts:
	src/main/js/noesis/bootstrap/facility/directives/neFacilityBaseline.js