Merge "[CDS-SDC-DIST] Move CDS listener to use strimzi kafka user template"