CONN-646: Modified the build to fix the keystore/truststore password change issue
Merge pull request #812 from CONNECT-Solution/4.2_integration

4.2 integration