Bug 985090 - Fix voicemail number migration issue and refactor

https://bugzilla.mozilla.org/show_bug.cgi?id=985090