1017992 - only show enabled products on product page
986845 - allowing cli to update all packages
Include new candlepin logs in katello-debug output.

As of candlepin-0.8.30 new logging was introduced which will result in
several new log files in /var/log/candlepin.

Leaving tomcat logs included as these still may contain tomcat/SSL
startup errors.
1018277 - ignore failed dashboard widget loading from preferences
918157: errata elasticsearch query: fix for change to api

The api for self.search was changed to use an options hash
vs a list of arguments. This change is to use that updated
signature in the self.filters which is used by the katello
api/cli.
1012073: Sync Mgmt: update to provide status bar for puppet repos

This commit contains changes to enable 2 things for syncing puppet repos
in the ui:

1. list the number of puppet modules being syned (similar to # yum pkgs)
2. provide behavior for progress bar... since the pulp status/progress
   for puppet repos is different from yum repos, the status will
   be based module counts vs size (in bytes)
Rubocop: Updating rubocop to 0.14.1
Merge pull request #3197 from daviddavis/temp/20131016144642

Rubocop: Updating rubocop to 0.14.1
Merge pull request #3167 from jlsherrill/1018277

1018277 - ignore failed dashboard widget loading from preferences
Merge pull request #3179 from jlsherrill/1017992

1017992 - only show enabled products on product page
Merge pull request #3185 from jlsherrill/986845

986845 - allowing cli to update all packages
Merge pull request #3192 from bbuckingham/918157

918157: errata elasticsearch query: fix for change to api
Merge pull request #3196 from bbuckingham/1012073

1012073: Sync Mgmt: update to provide status bar for puppet repos
Merge pull request #3189 from dgoodwin/candlepin-logs

Include new candlepin logs in katello-debug output.
Fixes #980158 - Proper username escaping/unescaping
Merge pull request #3191 from ares/bug/980158

Fixes #980158 - Proper username escaping/unescaping
1016134 - use node-installer instead of katello-configure-foreman-proxy
Merge pull request #3184 from iNecas/bz/1016134

1016134 - use node-installer instead of katello-configure-foreman-proxy
Merge remote-tracking branch 'upstream/master' into devel-merge

Conflicts:
	app/models/organization_destroyer.rb