Fixes #6187,BZ1125358 - Deleting a resource and creation a new one wont lead to conflicts