Engine: API v2 - fixing bad merge-conflict resolution

these files were moved:
app/views/api/v2/common/collection_resource.json.rabl --> app/views/katello/api/v2/common/collection_resource.json.rabl
app/views/api/v2/common/single_resource.json.rabl --> app/views/katello/api/v2/common/single_resource.json.rabl