Fixes #8235: Add orgzanization_id to the systems json which is generated
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
Fixes #8273/BZ1138868: fix JS error on content hosts page.

Use track by in ng-repeat to fix javascript error on the
content hosts page when visiting multiple content hosts
sequentially.

http://projects.theforeman.org/issues/8273
https://bugzilla.redhat.com/show_bug.cgi?id=1138868
Merge pull request #4781 from cfouant/content-override

fixes #6060 - Fixes activation-key content override, BZ 1104638
Merge pull request #4801 from jlsherrill/8268

fixes #8268 - adding progress reporting for puppet sync
Merge pull request #4799 from jlsherrill/8262

fixes #8262 - fixing progress updating on sync status page
Merge pull request #4797 from jlsherrill/8255

fixes #8255 - properly display new version for publish after just publis...
Merge pull request #4803 from waldenraines/8273

Fixes #8273/BZ1138868: fix JS error on content hosts page.