Merge proposals dependent on lp://qastaging/~cyphermox/network-manager/sort-ofono-connections

1. sort-ofono-connections
2. Dependent merge proposals