Update ConfirmEdit to master

Change-Id: I83ddef056b50fb130ac85e7292f5991fcaf5b7d1
Merge "Update ConfirmEdit to master" into wmf/1.22wmf3