Merge "add python 3.6 unit test job"