Merge "[DCAE] Disable CBS deployment and remove CBS dependency"