Revert "Updating Cirrus to master"

Meant for wmf13, which already has master. Should've fetch --all'd.

This reverts commit 57e2b06229c0fc2176cd17138fa469d0d0ca2c04.

Change-Id: I7afe4d89a0dfe6f3ff211dd65f464b08af6838f6
Merge "Revert "Updating Cirrus to master"" into wmf/1.22wmf12