[Merge] ~awe/network-manager/+git/ubuntu:touch-vivid-ota13 into ~network-manager/network-manager/+git/ubuntu:touch-vivid

[Jim Hodapp]

Review: Approve code

LGTM
-- 
https://code.launchpad.net/~awe/network-manager/+git/ubuntu/+merge/301177
Your team Network-manager is requested to review the proposed merge of ~awe/network-manager/+git/ubuntu:touch-vivid-ota13 into ~network-manager/network-manager/+git/ubuntu:touch-vivid.