Merge "Fix dmaap-datarouter test to run with py36"