Merge remote-tracking branch 'refs/remotes/origin/release-candidate' into release-candidate
BZ-10553 baseline fixes.
Merge remote-tracking branch 'refs/remotes/origin/master'

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