WP-3060-2 Changes for getting unique name and blocking node_presave during import