Merge "Extend sonatype-clm.sh goals"