Alejandro Abdelnur c25a45dc52 Merge -r 1357722:1357723 from trunk to branch. FIXES: MAPREDUCE-4355 %!s(int64=13) %!d(string=hai) anos
..
main 4bc2774d79 svn merge -c 1335567 FIXES: MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby) %!s(int64=13) %!d(string=hai) anos
test c25a45dc52 Merge -r 1357722:1357723 from trunk to branch. FIXES: MAPREDUCE-4355 %!s(int64=13) %!d(string=hai) anos