Merge "Split maven-deploy into a macro"