Merge "Fix policy maven-docker-stage"