Changes for new versions of Storm and a couple feature additions (HA queues and configurable requeue on fail)

This supercedes our previous pull request