Merge "Adding python 3 support for the Makefile.py file for the zhtable"