Fix for DIRSTUDIO-901 (Add the ability to store connection passwords in a password-protected keystore)