FLUID-5120: Update modulefiles plugin

More bug fixes to modulefiles plugin