Engine: api v2 root-node for single-object responses
Engine: API v2 - ping controller and /api/ping route
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
Engine: API v2 - renaming common resource templates to match
rendering.rb
Engine: this route is actually /status
Engine: API v2 - /api/status
DIRTY COMMIT -

making resource root-node optional based on http param sent from a
client