Revert "Revert "Merge branch 'master' into deployment""

Authored by Ejegg.


Revert "Revert "Merge branch 'master' into deployment""

Apparently we've been flummoxing the SWAT team for a while now.

Our payments cluster deployment branch should only concern
fr-tech. Patch to get it out of the wmf/ branches is here:

This should get our deployment branch back to where we can
deploy today's Amazon and WP updates.

This reverts commit fd3ffe9022e9f3c0eb56b3f8e33caa45460b1f3d.

Change-Id: Ia23bc519d02582a337851b6009a5b9c4ede4e968