FENNEL: Minor changes to let Windows builds go through.
FENNEL: Minor changes to let Windows builds go through.

[git-p4: depot-paths = "//open/dy/dev/": change = 14585]

LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb,LucidDB/luciddb