Merge: nitc: fix closing manifest writer, should fix bug on #1216