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