Adds trove-conductor service to trove.

Change-Id: Ibf14267c9a2125218c17fb34761548e339c8e784
Merge "Adds trove-conductor service to trove."
Merge branch 'master' of github.com:openstack-dev/devstack