Merge "Refactor generation of SSL certificate dialogs"