#583 CSW Harvester: code cleanup to remove code related to old fixed search filters
Fix null pointer error when enabling postgis shared datasource due to missing primary key in spatial feature and remove duplicate "Expose Primary Keys" option in postgis alternate datasource
#672 Import metadata doesn't update xsi:type values in iso19139 when using default namespace
Basic Shibboleth support
Adding shibboleth + save user on ldap
Merge pull request #696 from Delawen/shibboleth

Restoring Shibboleth
Fix editor layout for gmd:PT_FreeText elements
Merge pull request #673 from josegar74/fix_672

#672 Import metadata doesn't update xsi:type values in iso19139 when usi...
Merge pull request #585 from josegar74/fix583

#583 CSW Harvester: code cleanup to remove code related to old fixed search filters
Merge pull request #646 from aodn/develop

Fix null pointer error when enabling postgis shared datasource due to mi...
Add abbreviated labels to viewer nav bar so they fit better
Repaired import from directory
fixed background image url
Added outputSchema option to csw harvester
Fix for file upload services.
Change default from import from directory (on server) to upload a file.
Fix the check to see if server needs to be upgraded./
Added outputSchema option to csw harvester
Fix for file upload services.
Merge branch 'develop' of https://github.com/geonetwork/core-geonetwork into develop

Conflicts:
	harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/csw/CswParams.java