changes required for owncloud7 and LDAP password mapping.
merge of remote fork.
Merge branch 'master' of https://github.com/BeneDicere/user_shibboleth