Revert "Revert "More sensible behavior when special page aliases conflict""

Fixed in MF.

This reverts commit c7132cf2f1b1959d0cab0870fb9785565ecf0fe1.

Change-Id: If6a1ac888970dac03386e54a7fe130c9280302c7
Implement FauxRequest::getRequestURL() - needed for MF tests

Change-Id: Ib780582cdc68cb770c5fd12d805f4561bc0e2a13
(cherry picked from commit 14433b56fdd34fcca848b50ce3da2f5b52a85d58)
Merge "Revert "Revert "More sensible behavior when special page aliases conflict""" into wmf/1.25wmf1
Merge "Implement FauxRequest::getRequestURL() - needed for MF tests" into wmf/1.25wmf1