Merge changes I4e32a588,I202c5653 into qt-dev

* changes:
  Make MediaHTTPConnection thread safe.
  Revert "MediaHTTPConnection: move connection states into an inner class"