Everything else to 1.21wmf12

Change-Id: I3808c6969991b2134b50d79f00dc80c1f4ee91f8