Revert r1433756: HDFS-4288. NN accepts incremental BR as IBR in safemode. Contributed by Daryn Sharp.

This commit caused TestBlockManager to fail.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433821 13f79535-47bb-0310-9956-ffa450edef68
Merge -r 1433878:1433879 from trunk to branch-2. Fixes: HADOOP-9212. Potential deadlock in FileSystem.Cache/IPC/UGI.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433882 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2' of github.com:griddynamics/yhadoop-common into branch-2-gd
Merge branch 'branch-2-gd' of github.com:griddynamics/yhadoop-common into fb-HADOOP-9170-branch-2-gd