Consistenly use jsonutils instead of json

Under Python 2.6 jsonutils imports simplejson, which
can not be used together with json. Using jsonutils
everywhere avoids the conflict.

Change-Id: I25ddae130bd42d2788a2f8cf37986b7e0d851827
Closes-Bug: #1325235
Catalog driver generates v3 catalog from v2 catalog

The default get_v3_catalog method in the catalog driver would just
raise NotImplemented. This method is given a default implementation
that generates the v3 catalog by translating the v2 catalog.

With this change, the templated and kvs catalog backends can
generate a v3 catalog.

Closes-Bug: #1313458
Change-Id: I1646c7dcab90f2e0e9e370f48f7ee3643bd2fe3d
Make sure all the auth plugins agree on the shared identity attributes.

Note: this patch also corrected some of the external auth tests where an
auth request consists of two methods with two different identities.

Closes-Bug: #1299012

Change-Id: I5d7dd42d373879322823b16b215f11a015b734f8
Merge "Consistenly use jsonutils instead of json"
Merge "Catalog driver generates v3 catalog from v2 catalog"
Merge "Make sure all the auth plugins agree on the shared identity attributes."