Merge DatagramIterator changes from downstream libastron-cxx.