Removed invalid classpath entries
Updated imports to match refactored KeyStore
Removed keystore init call
Merge branch 'master' of https://github.com/jcryptool/crypto.git
Updated KeyStoreManager usage after refactoring

See Core commits for more information