changed inheritance relations to match core changes

companion to cyclus/cyclus#701