Merge 3dfb3ebbe1f8fa75f8744ade7767ac5c382fe2ba on remote branch

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