Reduce diff with trunk, sort the mtree excludes