Updated package name
Dont dl ldap_sso from make. It is included in ldap.
Merge branch 'develop'
Merge branch 'develop'