Move YARN container-executor bits to after we have a yarn group available