make LDAP query scope configurable

Get the DN from the LDAP server itself rather than hardcoding its format.

Fixes bug 1122181

Change-Id: I6f70c480b5c6f1b064e74d3cbd2cd8ca5ee82b0a
Disable XML entity parsing

Fixes bug 1100282 and bug 1100279.

Change-Id: I6a7c9e7110e1c7890205d6e4550ab46295c68906
Ensure user and tenant enabled in EC2

Fixes bug 1121494.

Change-Id: If7277f0b4a55aa5be81b354cd4c7ed338a600a62
merging in fix from oslo upstream

Change-Id: I61ae24b305df086a5c48a6d033046d84296023b2
Merge "Ensure user and tenant enabled in EC2"
Correct SQL migration 017 column name

The user_project_membership still uses tenant_id and not project_id
as a column name, the migration code uses project_id for both tables.

Fixed bug 1130424

Change-Id: Id7c9f78235ad87103ecf469bea312e6291c0a327
Merge "merging in fix from oslo upstream"
Merge "Disable XML entity parsing"
Merge "make LDAP query scope configurable"
Merge branch 'master' of https://github.com/openstack/keystone