Fixing #513
Merge branch 'stable-develop' of https://github.com/geonetwork/core-geonetwork into eea