Merge df7cf01ae5bd482c6f1c6b47419c6848d84013cd on remote branch

Change-Id: I9f56b116bb58319cd78fb87b3d6f8f6750e708ad
tree: 31801d083f54e7e4d7b47c85c7465a2683a11de6
  1. ipacm/
  2. ipanat/
  3. configure.ac
  4. Makefile.am