Mass merge of master into stable/juno

This merges all of master into stable/juno for use in the 10.1.0
release cycle. This merge was taken directly out of master and
applied as a patch. Due to permission issues and general merge
conflicts this was the easiest and most reliable way to
accomplish the mass merge.

Change-Id: I33068df8b85962e35cfde2038e60af2b3ca6ca12