Update the Icedove account setup wizard security patches according to what'll be decided upstream
see https://bugzilla.mozilla.org/show_bug.cgi?id=971347
Parent Task: #6156
Original created by @u on 11450 (Redmine)
see https://bugzilla.mozilla.org/show_bug.cgi?id=971347
Parent Task: #6156
Original created by @u on 11450 (Redmine)