Merge "Also await IpClient's shutdown" into pi-dev
tree: 8612a2ef4e07f63282f7b1aeb2b83fbb3ed7810d
  1. service/
  2. PREUPLOAD.cfg