Query only attributes strictly required for keystone when using it
with existing LDAP servers

Fixes bug 1102358

Change-Id: I7dd3ba1d66e0400fefb303f50dc84c145717a47e
remove duplicate model declaration/attribution

Change-Id: I3e91fb236b38ff50c33c6b75ad2f3527a9f363d6
Merge "Query only attributes strictly required for keystone when using it with existing LDAP servers"
Merge "remove duplicate model declaration/attribution"