bcfg2-lint: fixed old Cfg API call in Cfg plugin
bcfg2-lint: Fixed bugs in MergeFiles, added check for identical files