[KRACOEUS-8543] Ad hoc dialog and ad hoc service fixes
Merge pull request #1323 from bsmith83/adhoc_dialog

[KRACOEUS-8543] Ad hoc dialog and ad hoc service fixes