SettingsManager / Split harvester settings and system settings.
Settings / Remove hierarchy (#168).
Properly add setting tree to UFO.
Settings / SMTP / Add username, password and SSL options (#169).
Merge remote-tracking branch 'upstream/develop' into improvement/split-settings-and-harvester-config

Conflicts:
	core/src/main/java/org/fao/geonet/kernel/metadata/DefaultStatusActions.java
	web/src/main/webapp/WEB-INF/config-security-mapping.xml
Administration / info / Properly display setting.
Add services providing statistics about search and catalog content (return XML response). Enable stats by default.
ISO19139 / Improve keyword-mapper process, add contact-updater process, rename url updater.

 * keyword-mapper: use parameter search=key1;key2&replace=newkey1;newkey2 for defining keyword mapping
 * contact-updater: use parameter emailToSearch=an@email&contactAsXML=xmlSnippet for replacing CI_ResponsibleParty
 * url-host-relocator: use parameter urlPrefix=http://old&newUrlPrefix=http://new to update URL in gmd:URL elements.
Merge branch 'improvement/split-settings-and-harvester-config' of git://github.com/fxprunayre/core-geonetwork into fxprunayre-improvement/split-settings-and-harvester-config

Conflicts:
	web/src/main/webapp/WEB-INF/config-security-mapping.xml
Database / Add migration scripts for 2.11 and Settings migration.
Migration / Do not rely on SettingManager to get database version. In 2.11.x SettingManager could not be initialized using a previous DB structure. Directly retrieve database version using SQL.
Add profile name when getting user groups.
Ignore stat temp folder and .checkstyle.
Findbugs.
get changes from 3eb7dbb304c4ba2829353e5f12a5c84fc682cf9e

Fixed issue with registration and password reset not working

Possibly caused by spring security implementation.
Fixed issue when the referer was null
Merge pull request #224 from ianwallen/develop

get changes from commit 3eb7dbb304c4ba2829353e5f12a5c84fc682cf9e (2.10 branch) and resolve conflicts.
Fix issue 213
Fixed issues related to last commit (dcd363f2cb8cbb08a0113a370c0fcc506061aa8b)
   - characterset issue with ita
   - commited conflict info from nor
Merge remote-tracking branch 'origin/develop' into develop
Refactoring / Give a name to new module.