Merge "Add distribution management to pom"