Refactor webtestNewDialogContact and other webtest cleanup
Merge pull request #4189 from colemanw/webtestNewDialogContact

Refactor webtestNewDialogContact and other webtest cleanup