Merge pull request #571 in ZP/z-push from bugfix/ZP-1270-unknown-origin-and-warnings-when to develop

* commit '228c947b':
  ZP-1270 Fixed whitespace.
  ZP-1270 Fixed warning when parentid is not set.
  ZP-1270 Change API so another device can be loaded adhoc into the DeviceManager, fixed warnings.