Merge "CI: Update Ubuntu and CentOS8 builder images"