Added the functionality required for BZ#1011904 - Support multiple config files.