Merge changes I3b56e75d,I36255a2c

* changes:
  Skeletal IpManager proxying to the new IpClient
  Rename IpManager to IpClient