MAPREDUCE-4879. TeraOutputFormat may overwrite an existing output directory. (gera)

(cherry picked from commit 25a04402389dce0222938df4375d4545f8c1f34f)
Merge remote-tracking branch 'remotes/origin/branch-2' into branch-2