BZ-12025:Fix mark-up issues
Merge branch 'release-candidate' of https://github.com/NoesisEnergy/bootstrap into release-candidate