Merge pull request #1780 from cdjackson/zwave-ZW_AssignReturnRoute

Fix logging error in assign return route
Merge branch 'master' into zwave-initialisation

* master: