Helpdesk frontend related fixes and general cleanup

Change-Id: Id0ef4366febaa47d8f6393b3370bd19fd69185d3
Closes-Bug: #1555138
3 files changed