Everything to 1.22wmf5

Change-Id: I08d86f7b298b631fe71ac5ae61869ee96eef3828
Merge "Everything to 1.22wmf5"