Merge "Add DCAE maven-stage fixes"