make sure master restarts dsService if twill services are already running
get a new instance of dsService when restarting
Merge branch 'feature/fix-master-ds' into release/2.6.0
Merge branch 'release/2.6.0' of github.com:caskdata/cdap into release/2.6.0