Merge "Update maven-docker-stage for policy"