am bd49a1da: Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev

* commit 'bd49a1dadfbd7803642066a5bdc74305a1b2340b':
  Change case of "keyset" to "keySet" for manifests