Merge pull request #585 from mposolda/master

Upgrade to latest picketlink. Fix LDAP configuration according to that
Ensure that displayName is persisted. Add 'user' to ActiveDirectory classes