Added fix to use commandline keystorepass

Reviewed by: Bryan Higgins <bhiggins@blackberry.com>
Tested by: Tracy Li <tli@blackberry.com>