Fix up some more unicode vs. bytes issues.
Review Request #10289 — Created Oct. 29, 2018 and submitted — Latest diff uploaded
This change fixes up some lingering issues related to string types when
running across Python 2 and 3.
- Ran unit tests.
- Verified
rbt diffoutput when running on Python 3.