CORE-5525: removed entity field definitions from notification entities, and made a few more changes to clean up the notification agent and facilitate testing