XD-1378: Refactor MQTT module options