This will be improved shortly with Generic MQTT and this: How to connect any MQTT device to Cumulocity IoT