SLIDER-439 RM never fulfilled Slider AM's container request after NM died on a node where HRegionServer was running
Resolve merge conflict