[TIMOB-13555] Don't set content-type if the user sets it first
Merge pull request #4578 from bryan-m-hughes/timob-13555-3_1_X

[TIMOB-13555] Don't set content-type if the user sets it first