906426 - Create the upload directory if someone deletes it
added a consumer ID to conduit
Merge branch 'master' into mhrivnak-consumerid
Merge branch 'master' into mhrivnak-consumerid
homie the clown says: try again
Merge pull request #303 from pulp/jconnor-upgrade-schedule-fix-2

homie the clown says: try again
Automatic commit of package [pulp] release [2.1.0-0.8.alpha].
Automatic commit of package [pulp-builtins] release [2.1.0-0.8.alpha].
Automatic commit of package [pulp-citrus] release [2.1.0-0.8.alpha].
added "consumer_id" to the conduit, renamed a gofer plugin so it wasn't conflicting with the "pulp" namespace, and added the beginnings of a unit test. Doesn't work due to gofer.agent.plugin.Plugin.find() returning None.
Mocked gofer and pulp plugin for conduit tests.
making imports PEP-8 compliant. Also fixing the order of mock decorators so they don't trigger a bug in gofer. The "getLogger" mock must happen first.
modifying spec file to use new file names
Merge remote-tracking branch 'origin/master' into mhrivnak-consumerid

Conflicts:
	platform/pulp.spec
removing extraneous comment
Merge pull request #308 from pulp/mhrivnak-consumerid

Mhrivnak consumerid
Merge pull request #295 from pulp/jdob-906426

906426 - Create the upload directory in case someone deletes it
New version of okaara with deadlock fix
Automatic commit of package [python-okaara] minor release [1.0.29-1].
Added okaara as a server dep (for the upgrade script) and upped version