Revert r1433755: 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/trunk@1433820 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9212. Potential deadlock in FileSystem.Cache/IPC/UGI.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433879 13f79535-47bb-0310-9956-ffa450edef68