Revert r1433756: HDFS-4288. NN accepts incremental BR as IBR in safemode. Contributed by Daryn Sharp. This commit caused TestBlockManager to fail.