Update Cirrus to master

Change-Id: Ic405cefca133a696b33f79254e439cf6c4de5a82
Merge "Update Cirrus to master" into wmf/1.23wmf9