Remove the older (not used) resumption mechanism

Change-Id: I0b6507a6f551c3f6d39e5310fb663beb51468ee0
Add basic sanity tests for unordered flow

Fixes: bug 1224194

Change-Id: Id5af06a2f10e357e8d042df6f41795cc9328469b
Merge "Add basic sanity tests for unordered flow"
Merge "Remove the older (not used) resumption mechanism"