Merge branch 'master' into jconnor-citrus-downloader
post upgrade publish script to publish repos
changes that came out of the deep dive
Merge pull request #265 from pulp/jconnor-citrus-downloader

Jconnor citrus downloader
Added ability to bypass the v1 directory clean up for debugging purposes
903387 - remove /var/lib/pulp/(packages|repos) and /var/lib/pulp/published
pep8 and other minor fixes; added script to spec file
Merge pull request #266 from pulp/prad-v1-upgrade-publish

post upgrade publish script to publish repos
Merge branch 'master' into jdob-v1-upgrade
Reworked v1 publish logic into site-packages
Add v1 distributions dir to clean up
 Adding support for ISO filesystem upgrade
fix relative data dir in download tests
fix the distribution location in v2
Fix pulp-dev; remove references to /var/www/pub and published/.
fixing issues from PR
Merge pull request #267 from pulp/prad-v1-upgrade-publish

 Adding support for ISO filesystem upgrade
Merge pull request #268 from pulp/jortel-903387

903387 - remove /var/lib/pulp/(packages|repos) and /var/lib/pulp/published
Updating consumer applicability api to add ability to specify optional repoids and optional units, also changing the format in which units are specified for the ease of queries by type_id
Updating a few docstrings and keeping the format of units sent to the profiler the same for now