Merging lustre plugin fix