Merge pull request #16601 from frappe/py3-travis-fix

fix(py3): Python 3 compatibility fixes