[Merge] ~slingamn/software-properties:norequests_redux into software-properties:ubuntu/master

[Dan Streetman]

I'd like to simplify this more; can you take a look at this MR:
https://code.launchpad.net/~ddstreet/software-properties/+git/software-properties/+merge/396926
-- 
https://code.launchpad.net/~slingamn/software-properties/+git/software-properties/+merge/396880
Your team Ubuntu Core Development Team is subscribed to branch software-properties:ubuntu/master.