Merge branch 'configFileChanges' of github.com:henn/haas into configFileChanges
config test fixups
Merge branch 'configFileChanges' of github.com:henn/haas into configFileChanges