Merge pull request #45090 from angeloudy/2017.7

fix TypeError in python 3

salt/utils/http.py

@@ -429,6 +429,8 @@ def query(url,
                     'charset' in res_params and \
                     not isinstance(result_text, six.text_type):
                 result_text = result_text.decode(res_params['charset'])
+        if isinstance(result_text, bytes):
+            result_text = result.body.decode('utf-8')
         ret['body'] = result_text
     else:
         # Tornado