Use node name in associations if it's available
Merge branch 'zwave-cfg' of https://github.com/cdjackson/openhab into zwave-cfg