Include API's response content types and parameter content types from its description.
Resolve conflicts and update tests
Merge branch 'kvarv-content_types'