UI-689: We don't send the call-forward number if empty anymore
Merge remote-tracking branch 'origin/master'
UI-695: Now normalize the data of trunkstore properly.