UI-585: Don't set the call-forwarding number if it's set to an empty
string by the UI.
Merge remote-tracking branch 'origin/master'