One of the items from our last conversation was to remove the hierarchy changes for ManageableContext.

I'd like to propose that we re-evaluate the hierarchy post EDR2, to avoid too many changes.  This is related to CDI-30.

If agreed, I can create a follow up ticket.

John