Minor modifications to the configuration loader to better support arquillian.

Some performance and behavior enhancements for gridshiftlocator.