Merge branch 'alxdarksage-duplicate-emails' into develop
started changes to make all users be in "test_users" role.
merged upstream changes
made changes so that new users are added test_users group. Additionally, there is a new method in useradminservice that deletes all test users (email addresses starting with bridge-testing) and those in the test_users group.
made some changes.
made requested changes from code review.
merged upstream changes.
Merge pull request #382 from SartoriusEarth/develop

Fixed test users explosion.
removed ScheduleChangeListenerTest. Apparently that should have been gone already. Additionally, added a flag that is true if the user has not consented to the most recent research document.
Merge pull request #385 from SartoriusEarth/develop

removed ScheduleChangeListenerTest. Apparently that should have been gon...
Merge branch 'develop' of https://github.com/alxdarksage/BridgePF into develop
Logging when this exception occurs
Merge pull request #387 from alxdarksage/develop

Adding logging for exception
Edited ConsentService to not provide as many nullpointerexceptions, edited UserAdminService to increase chances of success for delete, and changed name of ManualCleanup to ManualCleanupTest so that JUnit actually runs it.
merged with upstream changes.
added a comment.
Merge pull request #388 from SartoriusEarth/develop

Edited ConsentService to not provide as many nullpointerexceptions, edit...
Merge pull request #386 from eric-wu/develop

Backfill studies for health codes
fix lunch
Merge pull request #389 from DwayneJengSage/dev-djeng2

fix lunch