Apply upstream fix for zwave.update_config directory name and double-definition

[smockle]

Second attempt (following #3):

Fixes home-assistant/core#19893

Upstream issue: OpenZWave#156
Upstream commits: OpenZWave@3ef3e4b and OpenZWave@82e1f33

Also attempts to address @kpine’s comment in home-assistant/core#19893 (comment):

In fact, merging the upstream fixes now will actually cause a bigger problem now that 1.6 has been released. The OZW master branch, where the update_config service downloads files from, now contains all the 1.6 code along with new XML files that are incompatible with 1.4. Unless python-openzwave or the HA fork update it to use the 1.4 branch instead, the wrong config files will be downloaded.

[smockle]

The Travis CI build for this PR failed, but in fact there has never been a passing build of Home Assistant’s python-openzwave fork: https://travis-ci.com/home-assistant/python-openzwave/builds

======================================================================
FAIL: test_000_init (tests.lib.autobuild.test_lib.TestInit)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pyozw/tests/lib/autobuild/test_lib.py", line 46, in test_000_init
    self.assertEqual(manager.getPythonLibraryVersionNumber(), pyozw_version)
AssertionError: '0.4.19' != '0.1.4'
- 0.4.19
+ 0.1.4

[smockle]

cc @pvizeli Are you aware that Travis CI builds have never succeeded (see comment above)?

[smockle]

Three months have passed since I opened #3. Closing due to inactivity.