Merge pull request #430 from msweaver/4.0_integration

CONN-297: Updating to 4.0.1-SNAPSHOT mvn version.