Added fix to use commandline keystorepass