Merge branch 'rbarlow-950772' into pulp-2.2.1
975543 - Change the ISO "content" command name to "isos".
Merge branch 'rbarlow-975543'