Merge branch '32-replace-margo-with-mercury-in-client-code' of ssh://bscssrg.bsc.es:2222/hpc/gekkofs into 32-replace-margo-with-mercury-in-client-code