[Merge] ~sil2100/bluez:groovy-pi400 into ~bluetooth/bluez:groovy

[Sebastien Bacher]

Review: Approve

Thanks, I'm not happy with the changes (comments on the bug now) but since it's uploaded already let's get the Vcs in sync at least
-- 
https://code.launchpad.net/~sil2100/bluez/+git/bluez/+merge/393549
Your team Bluetooth is requested to review the proposed merge of ~sil2100/bluez:groovy-pi400 into ~bluetooth/bluez:groovy.