SLIDER-450 rename sample template and resources files for accumulo
SLIDER-461 Asymmetry in default arguments
SLIDER-443 remove default keystore location
SLIDER-449 Consume both streams for openssl (required for windows)
SLIDER-389. Upgrade kazoo code base to the latest version
SLIDER-158. Add a slider diagnostics command (Thomas Liu via smohanty)
SLIDER-450 additional fix to use default appConfig for accumulo testing
SLIDER-448 AMFailuresIT needs vagrant
Add log aggregation entries to resources-default.json
SLIDER-180. Add storm package for windows (I)
SLIDER-149 sync with move to short-named status
SLIDER149 in sync with YARN-913 changes
Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry

Conflicts:
	slider-core/src/main/java/org/apache/slider/client/SliderClient.java