More fixes to the helpdesk integration
Merge branch 'helpdesk_integration' into merge_guides2

Conflicts:
	modules/portal/app/backend/helpdesk/EhriHelpdesk.scala