Update WikimediaMaintenance to master

Change-Id: I2f6b560b625450d7e8685e01c700ec235c314e55
Merge "Update WikimediaMaintenance to master" into wmf/1.21wmf9