Clean up interactive config

Change-Id: Iea14359bd224dd5533201d4c7cb1437d5382c4d1
Merge branch 'run-service' into dt-test
Merge branch 'nova-init-net' into dt-test
Merge branch 'interactive-conf' into dt-test