fix issues with media types and timeout
Merge branch 'master' of git@github.com:testobject/testobject-java-api.git