Update valgrind suppressions in line with upgrade to libc on some build slaves
Tidy includes for Env.h, fixing up the various other incorrect includes this showed up.
Re-add membership of multicast groups when the library is resumed.