Merge changes I67e5fa23,I223b207c

* changes:
  Use hasIpv[4|6]DefaultRoute instead of hasIPv[4|6]DefaultRoute
  Use local defined constants for notification channels
tree: e97a8e041a60b8b788bd363995639985568a2ada
  1. core/
  2. services/
  3. tests/