Fixes #6187,BZ1125358 - Deleting a resource and creation a new one wont lead to conflicts
Fixes #7126 - Upload docker images to the API
Fixes #7554 - Show user friendly error message on 413
Merge pull request #4782 from daviddavis/temp/20141029165526

Fixes #7554 - Show user friendly error message on 413
Merge pull request #4761 from daviddavis/temp/20141023155402

Fixes #7126 - Upload docker images to the API
Merge pull request #4571 from adamruzicka/fix-phases

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