Fixes #5418 adds enabled clause for annotations
not sure what a flush() is doing there
Fixes #5419 adds tests for enabling/disabling annotations and fixes bug with deleting disabled annotations when deleting an entity
Merge pull request #5427 from cash/enabled_annotations

Fixes #5418 adds enabled clause for annotations