Fixed issue 'Configuration files reading in opposite order #10'
Combined with previous fix, this effectively (though clumsily) fixes issue 'e2e_test pulling settings from configuration files #8'
Possible fix for issue 'Unable to set enableValueFilters=true, possible short term solution #9'
Merge pull request #11 from knickum/master

Fixed issue 'Configuration files reading in opposite order #10' and #9