SLIDER-1 steve broke jenkins. reverting
SLIDER-395 testZKIntegration broken
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop