testwiki and mediawikiwiki to 1.22wmf2

Change-Id: If80ce5e77fe5b3a094fb93622a6f63ea6817ac46