UNMAP:  Fix marshalling of DATA when more than one unmap descriptor is sent.
TEST: Add test for 0 blocks for UNMAP and fix num_blocks which was off by one
across the testsuite