Merge branch '32-replace-margo-with-mercury-in-client-code' of https://storage.bsc.es/gitlab/hpc/gekkofs into 32-replace-margo-with-mercury-in-client-code