Merge changes from topic "km-compat"

* changes:
  Keystore 2.0: Integrate legacy wrapper.
  Keystore 2.0: Make compatiblity wrapper use union KeyParameters.
  Add compatibility wrapper
  Keystore 2.0: Make key_parameter DSL more rust like