[WIP] - Standardize identifier behavior across apiserver

Depends on https://github.com/GoogleCloudPlatform/kubernetes/pull/321