Add flag to sort and finalize and plain finalize of whether to keep or delete incompletes if the operation fails

[alexowens90]

Default to keep to match current behaviour. Error messages should include reference to API method users can manually call to clean up incompletes

Duplicates #1839