CONN-646: Modified the build to fix the keystore/truststore password change issue

...nge issue