Merge "Add Keystore get option that supresses caught exceptions warnings."