Merge "Extract cds proto-definition dependency into parent pom"