SLIDER-149 fix a couple of regressions that showed up in testing ... this branch got out of sync with develop
SLIDER-149 in sync w/ YARN-913
SLIDER-149/YARN-913 tracking changes