Made conflict resolution test test_driver_t be responsible for allocating actions.
Removed has_begun and done fields of core_action_t in DiskConflictTest.
Made DiskConflictTest core_action_t inherit from accounting_diskmgr_action_t.
Removed intrusive list of core_action_t, made accounting_diskmgr_action_t be typedefed to core_action_t in DiskConflictTest.
Removed core_action_t typedef.
Made conflict_resolving_diskmgr_t be not templated.
Detemplatized stats_diskmgr_t.
Removed spurious uses of typename keyword in conflict resolving diskmgr.
Merge branch 'next' into sam_detemplatize_conflict_resolver