Thanks for posting those. My XML files under /var/lib/openhab2/zwave/ look very different than your files do so I am not sure I am looking at the correct file location or maybe openhab has gone through some major updates. I am uploading my .XML file here so you can compare.
