Merge "Commit to master [RIFT 15737] Remove logic for deletion of folder on deletion of descriptor catalog in UI. Protect against a null catalog name that comes when a field in catalog is updated."