Fixes #6187,BZ1125358 - Deleting a resource and creation a new one wont lead to conflicts
fixes #7711 - adding api errata comparison for content view versions
Merge pull request #4571 from adamruzicka/fix-phases

Fixes #7333,BZ1129635 - Deleting a resource and creation a new one wont lead to conflicts
Fixes #7604 - Enable docker image uploads
Merge pull request #4767 from jlsherrill/7701

fixes #7711 - adding api errata comparison for content view versions
Merge pull request #4786 from daviddavis/temp/20141030132721

Fixes #7604 - Enable docker image uploads from the UI
fixes #8131 - hypervisors forced into content host's org, env, and cv

tests and rubocop

updates based on p-r comments
fixes #8232 - fixing db:seed when called twice with seed organization
Merge pull request #4787 from jlsherrill/8232

fixes #8232 - fixing db:seed when called twice with seed organization
Fixes #8225 - RH Cdn url can now be updated

There was a bug preventing CDN url from getting updated
this has now been fixed
Merge pull request #4788 from parthaa/8225

Fixes #8225 - RH Cdn url can now be updated
Merge pull request #4779 from thomasmckay/8131-virt-who

fixes #8131 - hypervisors forced into content host's org, env, and cv
Fixes #8235: Add orgzanization_id to the systems json which is generated
fixes #8253 - updating requirements for foreman_docker

relaxing restriction on gem version as well
Merge pull request #4794 from jlsherrill/docker_rpm

fixes #8253 - updating requirements for foreman_docker
fixes #8255 - properly display new version for publish after just publishing old version
fixes #6060 - Fixes activation-key content override, BZ 1104638
fixes #8262 - fixing progress updating on sync status page
Merge pull request #4789 from bkearney/bkearney/8235

Fixes #8235: Add orgzanization_id to the systems json which is generated
fixes #8268 - adding progress reporting for puppet sync