Keystore password fixes #1546

Changed back to just using a secure random long.