fixes for geoNetwork 2.10.x

I made some changes for geoNetwork 2.10.x. I was based on branch 2.8.x but it seems that it is very different from master in this case and cannot be automatically merged.