Fix mistaken class registration

Change-Id: Ic90d166a0df9012fcdb20ab3999a5ab620bfb22f
Eat bad forward slashes

We're not sure why, but forward slashes aren't always escaped correctly.
Sometimes they turn into regex queries which can get pretty slow.  It seems
to be environment specific - development doesn't do it.  Might be hhvm or
the version of php-curl or ubuntu or whatever.  We don't know.  Rather then
try to send the / escaped its simpler to just turn it into a space.

Change-Id: Icb6a2f0097dc25f354dabae3632cfe962a21341b
Merge branch 'master' into wmf/1.24wmf14

Picks up:
- c0bf53c Eat bad forward slashes
- 8823083 Fix mistaken class registration

Change-Id: I999b8adc8be65dda4e5543177d2a8f6ea71c3c20