BUG: mark abstract classes correctly

Change-Id: Iae16568ba89d91f07c45a20a57b89f628a005fc9
Merge topic 'renable_catalyst_tests' into next

9cd9dfe BUG: mark abstract classes correctly