Merge changes from topics "capport_dhcpresults", "nm_cb_capport" am: 66b08c6e20

Change-Id: I22bbbb598aaca6ba6c73ab37d34e855ec0def48f
tree: b52c7ad22086e91d8cb5d3771b95df33d2b1595e
  1. core/
  2. services/
  3. tests/