This also includes the integration test from SemanticMediaWiki that caught this issue. Bug: T74870 Change-Id: I699e14958ee36ec5e86278e5dc0caed2a015d9af
Change-Id: Ieffeb0c7a15b202dcbdaf2a9d0b9bcdc10e360d2