combined python 3 changes
combined python 3 changes
merge fixes

Conflicts:
	test/interface/stat.py
	test/rdb_workloads/pretty_print.py
Merge Python 3 changes into next