Merge 10-6-stable-frozen into 10-6-stable

This stable branch was created with the other frozen branches for 10-6-stable. But had been updated with changes from master up-until omnibus master got 10.7 work added.

cc\ @rspeicher @jameslopez