Update on this patch: This is fully functional and tested on a Mellanox CX7. It applies cleanly on top of the merged flow suite, and can be merged pending any extra reviews.