Update for flow-networking changes

Signed-off-by: Chris Sanders <zidane@outlook.com>
Merge branch 'master' into material