Merge proposals dependent on lp:~pfalcon/linaro-license-protection/configs.capture-openid-groups

1. configs.capture-openid-groups
2. Dependent merge proposals