CONN-301: Fixes for makes direct easier to deploy in binary installs.
Merge pull request #444 from msweaver/4.0_integration

CONN-301: Fixes for makes direct easier to deploy in binary installs.