Fix volume detach since latest system dataset changes

Ticket:	#5341
(cherry picked from commit ab10eac709c03d964589a5785a31f83e0bdcbcd5)