Merged r114672 from wmf1.19 plus tests; crosswiki block name/id fix.