mqtt client id fix (again)

broke the deviceId by trying to fix the mqtt client id.