
This reverts commit fe0e5324d4248d114660ec35111ae9601e05b95b. Reason for revert: Python3.6 is still being used on Centos 8 based platforms. This is a partial revert, since the py36 job is currently failing, it will be restored in a follow-up patch. Change-Id: Idc0373f9a639cd66925543376fb1e2e3398666da