Made changes towards fixing SeattleTestbed/affix#56.
Merge branch 'fix-tcp_relay-dropping-data-SeattleTestbed/affix#56' into minimal-clean-alpha-release