make sure master restarts dsService if twill services are already running
Improve ServiceManager.getServiceURL() usage in TestFrameworkTest
Merge pull request #835 from caskdata/feature/improve-service-url-usage

Improve ServiceManager.getServiceURL() usage in TetstFrameworkTest
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
Merge branch 'release/2.6.0' into feature/r2.6.0_fix_search_links