Import patches-applied version 2.1.3-0ubuntu1 to applied/ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: db0601bdd8753aad210589ec9ce22ee67984df27
Unapplied parent: 9bb648958a406f80ab2097969e2e1ac65fec11a0

New changelog entries:
  * New upstream release (LP: #1543359):
    - Bug fixes for extension handling
    - Feature enablement for AzureStack.

1 files changed, 12 insertions, 2 deletions

diff --git a/azurelinuxagent/future.py b/azurelinuxagent/future.py
index 8451345..8509732 100644
--- a/azurelinuxagent/future.py
+++ b/azurelinuxagent/future.py
@@ -7,15 +7,25 @@ Add alies for python2 and python3 libs and fucntions.
 if sys.version_info[0]== 3:
     import http.client as httpclient
     from urllib.parse import urlparse
-    text = str
+
+    """Rename Python3 str to ustr"""
+    ustr = str
+
     bytebuffer = memoryview
+
     read_input = input
+
 elif sys.version_info[0] == 2:
     import httplib as httpclient
     from urlparse import urlparse
-    text = unicode
+
+    """Rename Python2 unicode to ustr"""
+    ustr = unicode
+
     bytebuffer = buffer
+
     read_input = raw_input
+
 else:
     raise ImportError("Unknown python version:{0}".format(sys.version_info))