Merge "Revert "Make distributionManagement reference groups""