BZ-12101 and BZ-12102: Text changes
Merge branch 'release-candidate' of https://github.com/NoesisEnergy/bootstrap into release-candidate