Merge proposals dependent on lp:~canonical-isd-hackers/canonical-identity-provider/logout-returnto-referer-matching-fix

1. logout-returnto-referer-matching-fix
2. Dependent merge proposals