HDFS-5203: revamped based on feedback so that no additional RPC/edit log op is required