Merge changes I6b2ce96b,I499f518f * changes: Fix order of deletion for files/dirs in ResolveMerger Don't return success on failing paths in ResolveMerger