Merge branch 'feature/SLING-8204-rename-sling-maven-plugin'