Fix for WFS import from geoserver to geoserver
Publish: If item type is changed, only create sortable children if we are editing an aggregation
Fix merge conflicts