Z-Wave not working after upgrade to latest 2.2-SNAP

Add-ons Bindings
1

If I use 2.2. Z-Wave binding everything stays in Initialising stat even tho logs shows “NODE 57: Node advancer: Initialisation complete!”. If I use http://www.cd-jackson.com/downloads/openhab2/org.openhab.binding.zwave-2.2.0-SNAPSHOT.jar it never starts up I just get the following and nothing more:

05-Dec-2017 09:49:53.386 [DEBUG] [org.openhab.binding.zwave                         ] - BundleEvent RESOLVED - org.openhab.binding.zwave
05-Dec-2017 09:49:53.391 [DEBUG] [org.openhab.binding.zwave                         ] - BundleEvent STARTING - org.openhab.binding.zwave
05-Dec-2017 09:49:53.393 [DEBUG] [org.openhab.binding.zwave.internal.ZWaveActivator ] - Z-Wave binding started. Version 2.2.0.201711192127
05-Dec-2017 09:49:53.394 [DEBUG] [org.openhab.binding.zwave                         ] - BundleEvent STARTED - org.openhab.binding.zwave
05-Dec-2017 09:49:53.810 [DEBUG] [org.openhab.binding.zwave                         ] - ServiceEvent REGISTERED - {org.eclipse.smarthome.core.events.EventFactory}={component.name=org.openhab.binding.zwave.event.BindingEventFactory, component.id=42, service.id=84, service.bundleid=196, service.scope=bundle} - org.openhab.binding.zwave
05-Dec-2017 09:49:53.820 [DEBUG] [org.openhab.binding.zwave                         ] - ServiceEvent REGISTERED - {org.eclipse.smarthome.core.thing.binding.ThingHandlerFactory}={component.name=org.openhab.binding.zwave.internal.ZWaveHandlerFactory, component.id=44, service.id=85, service.bundleid=196, service.scope=bundle} - org.openhab.binding.zwave
05-Dec-2017 09:50:03.044 [DEBUG] [org.openhab.binding.zwave                         ] - ServiceEvent REGISTERED - {org.eclipse.smarthome.config.core.ConfigOptionProvider, org.eclipse.smarthome.config.core.ConfigDescriptionProvider}={component.name=org.openhab.binding.zwave.ConfigDescription, component.id=41, service.id=213, service.bundleid=196, service.scope=bundle} - org.openhab.binding.zwave
2

Digging deeper, found an error in zwave.things:

2017-12-05 10:43:15.370 [ERROR] [.core.internal.folder.FolderObserver] - Error handling update of file '/etc/openhab2/things/zwave.things': Duplicate channels zwave:rtc_ct100plus_00_000:controller:node57:battery-level.
java.lang.IllegalArgumentException: Duplicate channels zwave:rtc_ct100plus_00_000:controller:node57:battery-level

The problem is that node57 only shows up once in my zwave.things:

Thing zwave:rtc_ct100plus_00_000:controller:node57 "Node 57: CT100 - First Floor" (zwave:serial_zstick:controller) [ node_id=57, binding_pollperiod=600 ] {
  Channels:
    Type sensor_temperature : sensor_temperature [ config_scale=1 ]
    Type thermostat_setpoint : thermostat_setpoint_cooling [ config_scale=1 ]
    Type thermostat_setpoint : thermostat_setpoint_heating [ config_scale=1 ]
}

It must have been auto imported, but I have autoapprove:enabled=false and org.eclipse.smarthome.links:autoLinks=false