Merge "KeyChain: add tests to check key type support" into klp-dev