Move YARN-1051 to 2.6