fixes #5919 - Fixes issue with katello plugin description, BZ1079191
Fixes #5863 - create consumer in plan phase

The failure is quite possible when creating a consumer in
Candlepin (mainly because of the activation key might be over-consumed
already).
Merge pull request #4164 from iNecas/issue/5863

Fixes #5863 - create consumer in plan phase
Merge pull request #4155 from cfouant/cfouant-branch

fixes #5919 - Fixes issue with katello plugin description, BZ1079191