Merge "Drop py3.6 and py3.7 from Tempest"