KeyStore tweaks, DatabaseConnection now uses KeyStore when password missing.
CherryKey fixes.