Don't set json content type for non-json data

+corresponding unit test on http client added

Change-Id: I8f2eacf595f1c73fea91b426b6c3fe6df4ad7bea
Closes-Bug: #1317259
Merge "Don't set json content type for non-json data"