Fix volume detach since latest system dataset changes

Ticket:	#5341