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