Removed exclusion of keystore dependent classes (KeyStoreUtil & OoeHttpClientConfigurer)