Merge "Adding cds-ui back to root pom"