Merge "Add grain for current kubernetes_version"