Update WikimediaMaintenance to master

Change-Id: I576554b9ba4b235b0aa732952dcc970616f1bc61
Merge "Update WikimediaMaintenance to master" into wmf/1.21wmf6