Fixup changes in API compared to master. #0
Merge remote branch 'upstream/network_namespaces' into network_namespaces