Updating Cirrus to master

Change-Id: Ib54265b2b44a8bd0ec0c095a207ff793820926e4
Merge "Updating Cirrus to master" into wmf/1.22wmf13