* Handle vaulted non-ascii characters for Python2
* Add a test to ensure str() no longer raises UnicodeEncodeError
(cherry picked from commit 826f224f02)
* Handle vaulted non-ascii characters for Python2
* Add a test to ensure str() no longer raises UnicodeEncodeError
(cherry picked from commit 826f224f02)