Fix handling of keystore creation
Merge pull request #3288 from imurchie/isaac-keystore

Fix handling of keystore creation