CS-5410: Sets config-dir parameter when URL is not valid and is handled via exception
CS-5410: Removes testing code
Merge pull request #707 from m038/CS-5410

WIP: Cs 5410