4591. [port] Addressed some python 3 compatibility issues. Thanks to Ville Skytta. [RT #44955] [RT #44956] (cherry picked from commit 6d19d975c6) (cherry picked from commit 17c7582ad8)
6d19d975c6
17c7582ad8
[RT #42586] (cherry picked from commit 4840ef4581)
4840ef4581