Automatic merge from submit-queue (batch tested with PRs 44788, 44859)

e2e: handle nil ReplicaSet in checkDeploymentRevision