CONN-319 testMpi doesn't update each build
Merge pull request #443 from jsmith2/CONN-319

CONN-319 testMpi doesn't update each build
Merge pull request #444 from msweaver/4.0_integration

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