Merge pull request #16683 from rhvgoyal/fix-couple-of-bugs

devmapper: Fix a bug and fix a comment and add one reliability check