Merge 53d8c57ee5afcf550df4e1c150309121ff77273d on remote branch

Change-Id: I03bcdbdea25c7f8d12999008f15a7259cd71c4ee
tree: 6d611f1b47e4547318dfa257dc01517515376498
  1. ipacm/
  2. ipanat/
  3. configure.ac
  4. Makefile.am