svn merge -c 1596310 FIXES: YARN-2050. Fix LogCLIHelpers to create the correct FileContext. Contributed by Ming Ma