MAP-809: Fix no-result error for no feedback conversations
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop