Backport protobuf and pgx upgrades [16.10]

Reuben Pereirarequested to merge
cherry-pick-3c80a77b into 16-10-stable

Backport !6707 (merged) and !6754 (merged) to 16.10 to fix failing the vulnerability job.

Edited by Reuben Pereira

Merge request reports