Merge "Add mvn-goals to stages"