Merge branch 'zwave-logging' of https://github.com/cdjackson/openhab into cdjackson-zwave-logging

Conflicts:
	bundles/binding/org.openhab.binding.zwave/src/main/java/org/openhab/binding/zwave/internal/protocol/ZWaveController.java
Merge branch 'master' into zwave-routing

* master:
  Changed logging in manufacturer command class.
  Standardise logging to allow identification of entries relating to a specific node.
Added support for private url without username/password.
GCal now supports
1) url, username, password
2) url (without username/password)
Merge pull request #829 from lbo123/master

Added support for private url without username/password.
Merge branch 'master' into zwave-routing

* master:
  Added support for private url without username/password. GCal now supports 1) url, username, password 2) url (without username/password)
Network monitor updates
Initial addition of association "get all" functionality
Updates to heal function
Test updates
Merge remote-tracking branch 'upstream/master' into remoteswitchSubDevice
TinkerforgeBinding: Bricklet Remote Switch sub device cleanup
Routing updates
Revert "Added support for private url without username/password."

This reverts commit 1a0f799fa9c1234b513cd6480d34f64856586257.
Update documentation and fix bug in daily timer routine.
Update handling or responses to network routing functions.
Google calendar: Added support for "Private Address" URL without authentification (added missing lines to be backward compatible)"
Merge pull request #833 from lbo123/master

Google calendar: Added support for "Private Address" URL without authent...
Add network events to signal success/failure of network related functions.
Added a function to return a list of required routing nodes
Add network events to signal success/failure of network related functions.