Automatic merge from submit-queue Cut genericapserver->registry dependency Towards moving genericapiserver into staging.