Update cirrus to master again

Change-Id: I49875a1091580043b625a56282201f90d3062649
Merge "Update cirrus to master again" into wmf/1.23wmf9