* Inline MQTT paho imports * Address comments * Fix patch paths * Move other imports inline * Fix test