Merge pull request #16686 from rhvgoyal/more-fixes

devicemapper: A bug fix and a code improvement