Merge "property.te: sort entries"