Merge "Chore: Update Centos7/Ubuntu18.04 nodes"