Merge changes I303d1102,I72c9aa43,If13a5284

* changes:
  Fix default network validation overcounting
  Prevent crash in NetworkManagementServiceTest#shutdown()
  Fix ApfTest
tree: c9bf67bedfe49147b97104503d8abd9de82ff521
  1. core/
  2. services/
  3. tests/