Merge "HC2VPP-372: Update HC2VPP jobs for bionic"