Fix for normal build failing.
Merge branch 'master' into devel
Added the functionality required for BZ#1011904 - Support multiple config files.