Merge proposals dependent on lp:~canonical-isd-hackers/canonical-identity-provider/fix-functional-tests

1. fix-functional-tests
2. Dependent merge proposals