Cirrus to master

Change-Id: I8b388b28e905fad48523af8b0d0bb59d43d8eaa0
Merge "Cirrus to master" into wmf/1.22wmf17