Update cirrus to master

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