Fixes #7333,BZ1129635 - Deleting a resource and creation a new one wont lead to conflicts

refactored organization delete