Merge "Use defaults to reference current keymint version"