Cirrus to master

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