Merge pull request #324 from CruGlobal/MH-962

Fix do not contact list and update followup status to nil if set to admi...
Fix test error
Merge branch 'MH-962' into dev