Ticket #1870: Ensure that citizen journalist role is not mistakenly assigned to user created by test
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop