Add erb processing to managed_files.yml
Also fixed and added some test cases
Merge pull request #2454 from fotioslindiakos/locked_files

Merged by openshift-bot
locking fixes and adjustments