(TWILL-86) Rename ServiceDiscoveryTest to ServiceDiscoveryTestRun to avoid the test being executed twice, one by itself and one by YarnTestSuite.

Signed-off-by: Terence Yim <terence@continuuity.com>
Resolving conflit with apache / incubator-twill master