Merge pull request #677 from sbutcher-arm/config-fix-2.1

Fix multiple erroneously named source files in comments - 2.1 backport