Merge pull request #3125 from apache/improve_jwtf_keystore_error_handling

Improve jwtf keystore error handling