Update WikimediaMaintenance to master

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