Fix bad HTTPStack merge
Merge pull request #148 from Metaswitch/fix_mock_request

[Reviewer: Ellie] Fix bad MockHTTPStack merge