Order couple of function more logicly, marking them static & add comment
Add stream-context support for listening to batch shipments
WS as per cs review
Merge pull request #599 from bjori/bulk-tweaks

Add stream-context support for listening to batch shipments

* bjori/bulk-tweaks:
  WS as per cs review
  Add stream-context support for listening to batch shipments
  Order couple of function more logicly, marking them static & add comment