Pulled out xml config location mechanism to reduce size of xmlconfigbuilder; did the same for the client to make it consistent
Fixed unused imports checkstyle problem
Merge pull request #2716 from pveentjer/cleanup/3.x/xmlconfiglocator

Introduced XmlConfigLocator