S56580: remove cfd toggle ref and fix resulting test breakage
Merge branch 'master' into S56580
Merge pull request #36 from RallySoftware/S56580

S56580: remove cfd toggle ref and fix resulting test breakage