Add units for more merge senarios.
nodes plugin tests: plugin config validation, payload validation.
Add tests for importer strategies error paths.
add errors tests.
927216 - remove CDS section from server.conf.
Automatic commit of package [pulp] release [2.2.0-0.2.alpha].
Automatic commit of package [pulp-builtins] release [2.2.0-0.2.alpha].
Automatic commit of package [pulp-nodes] release [2.2.0-0.2.alpha].
Fixed misleading (and in some cases incomplete) docstrings for
upload_unit
Merge pull request #451 from pulp/jdob-importer-docstrings

Fixed misleading (and in some cases incomplete) docstrings for
Add cancel support to content itineraries.
Merge pull request #445 from pulp/jortel-927216

927216 - remove CDS section from server.conf.
Add cancelled() to the handler conduit.
Merge pull request #450 from pulp/jortel-node-unit-coverage

Jortel node unit coverage
Merge branch 'master' into jortel-cancel-agent-requests
Merge branch 'master' into jortel-node-sync-cancel
Merge branch 'jortel-cancel-agent-requests' into jortel-node-sync-cancel
Refine cancel logic.
Add synchronization request objects.
encapsulate cancelled(); can be passed so strategies can be completely stateless.
update ssl options ssl_validation to match downloader changes.