MAPREDUCE-3219. Reenabled and fixed bugs in the failing test TestDelegationToken. Contributed by Hitesh Shah. svn merge -c r1197415 --ignore-ancestry ../../trunk/