am a5d68758: merge in master-release history after reset to ec00884cac216d1cb79556ca23b21ce55e35af3e

* commit 'a5d6875887a63797711093a169e7ef19c5a1ab3b':
  Fix for DNS resolutions when there is no default network set yet. We need to determine the actual netId to use prior to comparing it against the default netId.  Also initialize the default network variable.
tree: 905e375d2eae15018f3e05c45c30e0d299928452
  1. client/
  2. include/
  3. server/