adding override_config to repo import upload api to support custom options by plugins
adding override_config to upload manager and upload command with a few more unit tests
adding override_config to the rest-api documentation of upload api
removing unnecessary import and copyright declaration
Merge branch 'rbarlow-1098620'

Conflicts:
	common/pulp/common/error_codes.py
Merge branch 'pulp-2.4'
Merge branch 'bmbouter-python-kombu-testing-6-6-2014'
Merge branch 'bmbouter-1100610'
Merge pulp-2.4 => master, pre-build
Merge (-s ours) pulp-2.4 => master, post-build
Merge branch 'bmbouter-1105195'
Merge branch 'pulp-2.4'
Merge branch 'rbarlow-1097781'
Merge pull request #995 from pulp/skarmark-upload-override-config

Skarmark upload override config
Merge branch 'pulp-2.4'
Merge branch 'jcline-1094264'
Merge branch 'jcline-1094286'
Return exit code when running tests.

The exit code is needed by Travis so we can tell if the tests were successful
or not.
Merge branch 'jcline-1060866'
Merge pull request #1008 from beav/retcode

Return exit code when running tests.