Container deletion will now clean up Consumers

Previously, deleting a Container would orphan any existing Consumers.
They will now be deleted during the Container deletion process.

Change-Id: Ib7942911895a33cc34e8a297a63c463cf488f042