Code Review: rakefix2

FYI, Going in via direct commit

tfpt review “/shelveset:rakefix2;REDMOND\jdeville”
Comment :
More changes for git