Fixed some merge issues that affected adios_var_merge.c (changed API and
newly-exported utility function that conflicted with a local static
copy)