INFRA-584 Keystore Feature draft and updates