[Merge] ~seb128/software-properties:updates-combo-labels into software-properties:ubuntu/master

[Sebastien Bacher]

Thanks!
-- 
https://code.launchpad.net/~seb128/software-properties/+git/software-properties/+merge/478233
Your team Ubuntu Core Development Team is subscribed to branch software-properties:ubuntu/master.