Merge 203ebcfb8f4a58a6132e1d9c19f8c49114c2603a on remote branch

Change-Id: I8ca779ad71eb7cde111e93a4a311a56b3a1008c6
tree: 1c1736d91cf2908e742d48852466b2f99d3e88bd
  1. ipacm/
  2. ipanat/
  3. configure.ac
  4. Makefile.am