Master to devel rebase to merge the netem fixes back from master