Merge "Fixing reading key store pwd from env"

No match.