CDAP-690 Backport fix for empty puts and deletes to 2.5 branch