Merge branch 'revert-MNG-6772' of https://gitbox.apache.org/repos/asf/maven-integration-testing into revert-MNG-6772