Merge pull request #22882 from arjantijms/gf5build3

New infra - setting maven options