Small changes to get GeoNetwork Maven build to work