fixes #1850 - auto-publish to http and https
Merge branch 'master' of https://github.com/Katello/katello into issue_1850
adding ability to enable http publishing on a per-repo basis
spec fixes
fix pylint and add --unprotected to more commands
default logging changes

- turn off sql logging by default
- disable coloring for test log since it never goes to the console anyways
(cherry picked from commit 3cf470ac4639b2c1b493d8823223fb5d78ac2a34)
Merge pull request #1851 from jlsherrill/issue_1850

fixes #1850 - auto-publish to http and https
delayedjob-gemfile - lock to lower version of delayed_job_active_record
Merge pull request #1902 from thomasmckay/delayedjob-gemfile

delayedjob-gemfile - lock to lower version of delayed_job_active_record
fixing intermittent test failures

Root cause was PG::Error: ERROR:  column reference "id" is ambiguous
also adding test for method throwing the error
fixing trailing whitespace
Merge pull request #1903 from jlsherrill/test_fix

fixing intermittent test failures
924253 - Fixed definition delete message in CLI
Fixing package of content_search classes
Merge pull request #1901 from jlsherrill/logging

default logging changes
Merge pull request #1911 from daviddavis/temp_1365675606

Fixing package of content_search classes
Merge pull request #1905 from daviddavis/temp_1365621167

Content views: fixed definition delete message in CLI