Adding unit tests for the new common.config.ini.php feature - Refs #4133
Merge remote-tracking branch 'origin/master'