Return more helpful error messages when a resource conflict occurs
Merge pull request #5858 from edx/renzo/resource-conflict-error-messages

Return more helpful error messages when a resource conflict occurs