Merge pull request #16452 from markdoliner/develop

Fix salt-cloud ec2 requests containing spaces.

salt/cloud/clouds/ec2.py

@@ -333,6 +333,10 @@ def query(params=None, setname=None, requesturl=None, location=None,
         values = map(params_with_headers.get, keys)
         querystring = urllib.urlencode(list(zip(keys, values)))
 
+        # AWS signature version 2 requires that spaces be encoded as
+        # %20, however urlencode uses '+'. So replace pluses with %20.
+        querystring = querystring.replace('+', '%20')
+
         uri = '{0}\n{1}\n/\n{2}'.format(method.encode('utf-8'),
                                         endpoint.encode('utf-8'),
                                         querystring.encode('utf-8'))