Cleanup and updates to account for changes in the Candlepin, Pulp and Ce...

...rts

modules.