Merge proposals dependent on lp://staging/~canonical-isd-hackers/canonical-identity-provider/versions-view

1. versions-view
2. Dependent merge proposals