RPV-401

Fix for security on MessageManager - moved some of the validation but the bug was in getConversation where a null conversation type could be seen by anyone.
Merge remote-tracking branch 'origin/develop' into develop