Align geonetwork stuff to the updates provided for the issue #129