Merge "Fix for AllNodesExtraConfig and fix environment files to create swap files...