Fixing several errors in the LDAP module

 - The same attribute was mistakenly written to incorrect fields
 - A few tenant_ attributes were missing
 - The test was incomplete
 - The tenant_mail_attribute was mistakenly included, it doesn't exist

Change-Id: I57a05bce9b9246036f586bc80bc0b0c7f8b4694a
Merge "Fixing several errors in the LDAP module"
Merge git://github.com/puppetlabs/puppetlabs-keystone