- Refactored and consolidated KeyStoreUtils unit tests - Corrected KeyStoreUtils.loadEmptyKeyStore() to use KeyStoreUtils.getKeyStore() Signed-off-by: Nathan Gough <thenatog@gmail.com> This closes #5015.