Merge "Enable cmd/api & cmd/conductor to be launched directly"

ironic/cmd/api.py

@@ -64,3 +64,7 @@ def main():
         wsgi.serve_forever()
     except KeyboardInterrupt:
         pass
+
+
+if __name__ == '__main__':
+    sys.exit(main())

ironic/cmd/conductor.py

@@ -45,3 +45,7 @@ def main():
 
     launcher = service.launch(CONF, mgr)
     launcher.wait()
+
+
+if __name__ == '__main__':
+    sys.exit(main())