Add more details about geonetwork data dir resolution order.
Merge remote-tracking branch 'origin/master'