Merge "new conf file for flex pod 6.1 job due re-install of nodes"