Cirrus to master

Change-Id: I3a8b00ba74863fd9a2da855ece1cf8043bbd911c
Merge "Cirrus to master" into wmf/1.22wmf16