Merge "fixing rerun with free energy + .xtc or .gro" into release-4-6