Added tomcat6 to the list of dependencies that need to be installed for the Shibboleth Identity Provider or Discovery Service
Added mail parameter to ldif template for generating inetOrgPerson records using ldapaddperson