SLIDER-568 Refactor slider diagnostic options (Thomas Liu)
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider into develop