Merge "Fixed GMXRC so we are not polluting standard shell variables" into release-4-6