Merge branch 'nova-init-net' into dt-test