Merge pull request #23819 from arjantijms/consistent_appserver_pom

Consistent appserver pom