Fix IllegalStateException when specifying override locations in
server-side config
Merge remote-tracking branch 'jaggr/master' into jaggr-core
Merge pull request #137 from chuckdumont/jaggr-core

Fix IllegalStateException when specifying override locations in