Amend HDFS-2948. NN throws NPE during shutdown if it fails to startup Previous patch missed the case where the NN fails to start up when it's starting in standby state.