HBASE-25596: Fix NPE and avoid permanent unreplicated data due to EOF#2990

Merged

apurtell merged 2 commits intoapache:branch-2from sandeepvinayak:HBASE-25596-branch-2

Feb 25, 2021

+501-99

Commits on Feb 25, 2021