Fixes #6187,BZ1125358 - Deleting a resource and creation a new one wont lead to conflicts
Merge pull request #4571 from adamruzicka/fix-phases

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