[#1309] Fix placeholders in non-root locations
Tweak CHANGELOG
Change version number for 2.1.1 release