[TIMOB-6423] Fixed up keystore key password checking and prompting.