[Merge] lp:~brunonova/ubuntu/trusty/software-properties/lp1381050_lp1383289 into lp:ubuntu/trusty-proposed/software-properties

[Bruno Nova]

Michael Vogt said he would sponsor the upload, but he hasn't yet.
No problem! Maybe he forgot or is too busy.

I request a new review from the Ubuntu SRU Team (or Michael). Sorry if it's the wrong team.
Could someone check this merge request?
-- 
https://code.launchpad.net/~brunonova/ubuntu/trusty/software-properties/lp1381050_lp1383289/+merge/249534
Your team Ubuntu branches is subscribed to branch lp:ubuntu/trusty-proposed/software-properties.