Fix broken merge by 0a792a1dcba26dd70d64e307b301c6

Fix broken merge by 0a792a1dcba26dd70d64e307b301c6

Changeset 1 of https://gerrit.wikimedia.org/r/#change,3365:
763b57f9f2af131a2d8e65f520a23c00109be0e1

got mis-merged in changeset 2:
f752cf80423615b380cf5612a3f1f68a6b9d0173

And introduced into master wth
0a792a1dcba26dd70d64e307b301c6773279cfc9

Also, marking all new functions as @since 1.19
since we want to have them there later.

Patchset 2: whitespace fixes
Patchset 3: Fix <?php
Patchset 4: rebase to current master

Change-Id: Ic7d940dfec8890de20197128505962375fac4f06