Ignore conflict on v2 auto role assignment (bug 1161963)

Change-Id: I10581a39325b4fcdb997ad704c3ee0de494b32e0
Improve the performance of tokens deletion for user

Provide new delete the tokens api 'delete_tokens' to support
delete all the tokens for user in one session in the sql backend. For
the kvs and memcache, I also provide the corresponding implementation.

Fix bug 1178063

Change-Id: I986a583e5900ea04e26cbdb7c49638a33818bca7
(cherry picked from commit d6cfe4f2e2c7c1b3eb23bf9f864779940a645555)
Replace password to "***" in the debug message

Use regex pattern to replace password to "***" for both env vars and
request body output

Also includes a minor refactor to move the code up in the file as
suggested by termie and henry regarding the review comments in
https://review.openstack.org/#/c/26487/
(Original Change-Id: I890415c755dd383749f2d4382f53d0b3a6badc6c)

Fix bug 1166697

Change-Id: I671ea25cca78b4dea1fbf2e63c89b82912279f2d
Bump stable/grizzly next version to 2013.1.3

Change-Id: I85cb2efeb48c14132d2c94a1903ac39bc5c327e9
Force simple Bind for authentication

The authentication code was using a common code path with
other LDAP code that got an LDAP connection.  If the system
was configured to do Anonymous binding, users could by pass
the authentication check.

This patch forces the authentication code to do a simple_bind.

Change-Id: Id0c19f09d615446927db1ba074561b129329b5c8
Merge "Replace password to "***" in the debug message" into stable/grizzly
Merge "Improve the performance of tokens deletion for user" into stable/grizzly
Merge "Ignore conflict on v2 auto role assignment (bug 1161963)" into stable/grizzly
Fix issue with v3 tokens and group membership roles

The driver calls used by v3 token controllers to obtain roles
for a user on both project and domain were incorrectly implemented,
leading to roles being missed out of the token. v2 tokens are not
affected, since they don't use the same driver calls.

This fixes these functions and adds additonal tests to cover the
cases (all of which would fail without this patch).  As part of this
fix, the implementation of "get_roles_for_user_and_project() is
pulled up into the driver class (like the domain equivalent is already),
since, for all implementations, it is independant of backend technology.

Fixes bug 1197874

Change-Id: I48aaf79241c87377c6940ab6193fc3acd4006c94
Maintain tokens after role assignments (bug 1170186)

Conflicts:
	tests/test_content_types.py

Change-Id: Iacd2d9e09be4ab3d6a3c5acf4074e4af7e300602
(cherry picked from commit 132ff6d85e02acdce7483c2848686676cb4f14a0)