Added conflict declaration support
A couple of notes regarding changes to the following files: test_ppr_proposals.py - noticed reviewer references in the tests that looked like copy/paste artifacts. Changed references to be ppr_proposal-related. test_science_reviewer.py - needing science reviewers for testing in test_conflict_declarations I added a science reviewer to the Test Data Generator which necessitated changing the user id referenced in these tests.