Merge pull request #180 from sortega/broker_resubmits

Make server resubmit order matches