Reverting again everthing to 'Rebase on trunk' commit as my local branch was dirty

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/MR-2454@1415014 13f79535-47bb-0310-9956-ffa450edef68
12 files changed