[HEAD MERGE] Fix actually destroy a metadata stream

Signed-off-by: David Goulet <dgoulet@efficios.com>