Merge proposals dependent on lp://qastaging/~phablet-team/network-manager/rm-scofono-plugin-dbus-vivid

1. rm-scofono-plugin-dbus-vivid
2. Dependent merge proposals