[Merge] ~laney/software-properties:token-pass-empty-string-not-none into software-properties:ubuntu/master

[Sebastien Bacher]

Uploaded (unsure why launchpad didn't automark it as merged)

https://git.launchpad.net/software-properties/commit/?id=d7e1e7618
-- 
https://code.launchpad.net/~laney/software-properties/+git/software-properties/+merge/367899
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~laney/software-properties:token-pass-empty-string-not-none into software-properties:ubuntu/master.