Bump stable/grizzly next version to 2013.1.4

Change-Id: I817767bcb618edf94363aa34dd0eb6ce897ce141
Add netaddr to test requirements

Because of the way we do old keystoneclient tests we can end up with the
situation where an old keystone uses a newer keystoneclient without
doing an install and so misses out on the newer dependencies.

This patch is not a solution to the underlying problem, but should
prevent current gate failings.

Fixes: bug 1212939
Change-Id: I25eca24c6820611a5937a1f709ba42620b70b304
Fixes for Active Directory

The LDAP Identity backend was not properly using the
user_enabled_default option as a string. This caused
operations to fail with

 TypeError: unsupported operand type(s) for &: 'str' and 'int'

Also, fetching users using the LDAP Identity backend would fail with

 KeyError: 'enabled'

from _ldap_res_to_model when user_enabled_mask is not 0.

Closes-Bug: #1210175
(cherry picked from commit 68f38a65c60485c34474e490d649b328421e10f5)
(cherry picked from commit 116897786dbb8473154ec85a01b019af8106a1f4)
(cherry picked from commit 54178b735dea4dfee4578caa95cb3ae704afef07)
(cherry picked from commit 87ababb38506a1a51b9e38fc343dd3b46c828a80)
(cherry picked from commit 781c65b72b78bd1e2b1d93db029d6b0c6fbc2050)

Change-Id: Ic01aa505d867c1de30e2a1ed7c79ff1478e213ef
Use joins instead of multiple lookups in groups sql

Currently to determine a user's groups (or vice versa) we do
- 1 lookup for the user.
- 1 lookup for the association table.
- n lookups for the n groups the user has.

The association and groups lookup are replaced with a join query.

Fixes: bug 1218675
Change-Id: I560659eda1a30635399829e1c86f06734c90f9e2
(cherry picked from commit 6f9b75e2c3bbbd7dfc5e2d414d7271bb4f8bcf71)
Fix and test token revocation list API

Change-Id: I6c60bf2aecc7c9353e837e59a4e09860d049e0f5
Revoke user tokens when disabling/delete a project

- Revoke tokens scoped to all users from a project when disabling or
  deleting the project.
- Fix provided by chmouel

Closes-Bug: #1179955
Change-Id: I8ab4713d513b26ced6c37ed026cec9e2df78a5e9
Merge "Use joins instead of multiple lookups in groups sql" into stable/grizzly
Merge "Revoke user tokens when disabling/delete a project" into stable/grizzly
Merge "Fixes for Active Directory" into stable/grizzly