Cutting 2.10.15 release
Merge pull request #1130 from github/2.10.15-release

Cutting 2.10.15 release
Merge remote-tracking branch 'upstream/master' into fix-mercury-vendor-dirs