synced code with most recent changes
CDAP-739 fix test suites so that their tests are not run twice by
changing class names to end in TestRun so they dont get picked up
by the maven plugin.

Also did various other test cleanup to avoid side effects in
unit tests. Removed static variables used to control whether or
not setup for a class should run in favor of making explicit calls
to setup and cleanup a test.
CDAP-739 undo removal of static booleans, will see if we can
improve that in a separate issue.
CDAP-739 forgot to add back befores and afters.
(CDAP-590) Service discovery from a service
Merge branch 'develop' of github.com:caskdata/cdap into feature/CDAP-739-fix-test-suites
Merge branch 'feature/CDAP-739-fix-test-suites' of github.com:caskdata/cdap into feature/CDAP-739-fix-test-suites
Partial fixes for https://issues.cask.co/browse/CDAP-703 and https://issues.cask.co/browse/CDAP-460. Remainder of work will have to wait until 2.7.0.
Fix ExternalAuthenticationServer and its tests
Merge pull request #693 from caskdata/feature/fix-auth-server

Fix ExternalAuthenticationServer and its tests
use only one reducer in word count m/r
Merge branch 'develop' into feature/1-reducer
Merge branch 'feature/1-reducer' into develop
Update comments
Merge pull request #692 from caskdata/feature/2.6.0_doc_updates

(CDAP-703) Doc Changes due to unification of APIs: MapReduce and Service changes
Updated Spark job UI to display the collected metrics in blocks
addressed commits
move file set datset type into its own module
Merge pull request #680 from cybervisiontech/CDAP-713/SparkPageRank-example-archetype

CDAP-713: Update SparkPageRank example archetype
Revert "CDAP-713: Update SparkPageRank example archetype"