1079511 - better relative url collision prevention
1148928 - 404 is returned when publishing a nonexistent repo group
merge two diverged contribution docs
style changes
PEP-8 server.webservices.controllers.consumers.

Also PEP-8 its tests.
PEP-8 server.webservices.controllers.repositories.

Also PEP-8 its unit tests.
Fixes merge forward error only present on master
Merge pull request #1306 from bmbouter/fix-mongodb-merge-error-on-master

Fixes merge forward error only present on master
Automatic commit of package [pulp] release [2.5.0-0.19.rc].
Automatic commit of package [pulp-nodes] release [2.5.0-0.19.rc].
Merge branch '2.5-testing' into 2.5-dev
Merge branch '2.5-dev'
Merge pull request #1295 from asmacdo/1148928

1148928 - 404 is returned when publishing a nonexistent repo group
Merge pull request #1300 from asmacdo/contribution-docs-merge

merge two diverged contribution docs
PEP-8 the test_openssl module.
Merge branch 'pep8-consumers'
Merge branch 'pep8-repositories'
Merge pull request #1301 from asmacdo/commands-consumer-style

style changes
various pep8 cleanup, typo fixes, etc
Merge pull request #1293 from mhrivnak/cleanup

various pep8 cleanup, typo fixes, etc