Simplifies data structures for suspended packets

Change-Id: I5432d54ef86295a573c7c6912ad99e9a09bd9c5a
Signed-off-by: Duarte Nunes <duarte@midokura.com>
Merge "Simplifies data structures for suspended packets"