Stop adding extra Content-Length and Content-Type headers
Merge pull request #734 from Metaswitch/issue706

[Reviewer Matt] Stop adding extra Content-Length and Content-Type headers