SLIDER-34 re-enable disabled test to verify that YARN-2065 fixes the problem
SLIDER-354. Add support for zip packages containing application bits.
SLIDER-355. Agent is unable to connect to ZK on windows to retrieve AM host and port
SLIDER-356. Slider agent should not default to any host or port value when it cannot communicate with ZK
Merge branch 'develop' into feature/hbase_win_package
SLIDER-357. slider bash script cannot handle if java is in the path
SLIDER-359. Create hbase package for Windows
Merge branch 'hadoop2.5/SLIDER-34_AM_Restart_not_working' into develop
SLIDER-361 removed use of StandardCharsets
SLIDER-362 added section to README on how to modify an app package to contain accumulo native libs
SLIDER-335 enabled accumulo app package by default, can be disabled with -DskipAccumulo
SLIDER-363 monkey uses a static list for its entries
SLIDER-363 chaos monkey starting even when not needed
Merge branch 'feature/SLIDER-363_chaos_monkey_keeps_running_even_when_inactive' into develop
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop
SLIDER-359. Create hbase package for Windows
Merge branch 'feature/hbase_win_package' into develop
Unit test fixes to handle ZK retry in main
SLIDER-364 changed rpm directories to 755
Merge branch 'develop' into feature/SLIDER-304_hdfs_token_renewal

Conflicts:
	slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java