Merge proposals dependent on lp:~facundo/canonical-identity-provider/remove-refresh-with-both-macaroons

1. remove-refresh-with-both-macaroons
2. Dependent merge proposals