Release 1.2 cherrypick batch

[eparis]

#22989: Fix non-masquerade CIDR
#22942: Allow up to 39 PVs attached to AWS node
#22969: Disable kubectl validation for upgrade e2e
#22993: Bumped Heapster to stable version 1.0.0
#22948: Separate GetOldRS and GetNewRS in deployment controller (get and mutate) and deployment util (get only)
#23012: Make fullyLabeledReplicas optional in rc status
#23005: Trusty: Fix heapster breakage caused by #22940
#23020: Updating cadvisor deps to v0.22.2

[googlebot]

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.

[k8s-github-robot]

Labelling this PR as size/XL

[bgrant0607]

Thanks @eparis. Looking more carefully this time :-)

[eparis]

We've got bots for that :)

[k8s-github-robot]

Labelling this PR as size/XL

[eparis]

and now with cadvisor update

[bgrant0607]

Looks like we got them this time! Thanks much. LGTM

[k8s-bot]

GCE e2e build/test passed for commit 32aaa5a.

• Build Log
• Test Artifacts
• Internal Jenkins Results

[k8s-bot]

GCE e2e build/test failed for commit fa979b3.

• Build Log
• Test Artifacts
• Internal Jenkins Results

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

[eparis]

[Fail] Kubectl client Kubectl describe [It] should check if kubectl describe prints relevant information for rc and pods [Conformance] 
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/examples.go:506

[Fail] Kubectl client Kubectl expose [It] should create services for rc [Conformance] 
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/examples.go:506

[eparis]

@k8s-bot e2e test this flake: #IGNORE
because i think it is a flake, but hard to be sure...

[bgrant0607]

@eparis Why are we running examples test?

[bgrant0607]

I guess there are some conformance tests mixed in there.

[k8s-bot]

GCE e2e build/test passed for commit fa979b3.

• Build Log
• Test Artifacts
• Internal Jenkins Results

[bgrant0607]

Green now.

@eparis A couple kubectl tests flaked in head around the same time. I can't see the test artifacts yet, though, so I can't determine for certain that it's correlated.

[bgrant0607]

Merging.