PR for issue #748

Uses James' suggested fix for preventing the unlinking of the parent namespace when deleting name-conflicted objects.