Fix unload logic and lint error
Fix unload logic and lint error

moziot/gateway,mozilla-iot/gateway,mozilla-iot/gateway,mozilla-iot/gateway,mozilla-iot/gateway,moziot/gateway,mozilla-iot/gateway,moziot/gateway