SLIDER-34 re-enable disabled test to verify that YARN-2065 fixes the problem
SLIDER-149: service registry is on local hadoop trunk builds only
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
SLIDER-149 javadocs and whitespace
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry

Conflicts:
	pom.xml
SLIDER-149 yarn-registry dependency
SLIDER-149 yarn-registry alongside slider registry
Merge remote-tracking branch 'apache/develop' into feature/SLIDER-149_Support_a_YARN_service_registry
SLIDER-141 registry coming up on server; some test with the existing registry is now failing. Clash of roots?
SLIDER-149 mark some CuratorService methods as final
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
SLIDER-149 YARN and slider registries living side by side, though YARN reg is doing simple registration only
SLIDER-149 ProviderServices can register themselves and otherwise manipulate the YARN registry; AM register the liveness znode and itself as an (ephemeral) component
SLIDER-254 allow apps to use CredentialProvider for sensitive properties, update Accumulo app package to use it for the initial root password
SLIDER-254 bump Accumulo version to 1.6.1-SNAPSHOT and configure app package to use CredentialProvider
SLIDER-149 merge with trunk
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry

Conflicts:
	slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java
	slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry

Conflicts:
	slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
	slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestBuildStandaloneAM.groovy
	slider-providers/hbase/slider-hbase-provider/src/main/java/org/apache/slider/providers/hbase/HBaseProviderService.java
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry

Conflicts:
	slider-core/src/main/java/org/apache/slider/client/SliderClient.java
SLIDER-149 latest YARN-913 revisions