Merge "Update distributionManagement serverIds"