it was confused to customize opts in trove-conductor.conf
or trove-taskmanager.conf now.
if we want to customize a opts,The operator needs
to know which service is using the configuration opts.
actually trove uses trove.conf is enough for all services
this change combines all trove config files.
Change-Id: I5a630109e3c4b59bff216146a3ed64c6d47e247f
b567154395