Merge changes from topics "capport_dhcpresults", "nm_cb_capport" am: e777d054f4 am: 816695b23c

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