Even though setting the payload_content_encoding is deprecated, we
should not ignore it if set. Uncommented functional tests that found
this bug. Removed a couple of tests because they were incorrect.
Change-Id: Idd294909ddd622d3baf2e8df92c94f8f52ac5799
Closes-Bug: #1434652