Merge a missing part of 235613 to add the new dirs to mtree.