Fixes for pedantic filename case on linux
Merge remote-tracking branch 'upstream/vnext' into vnext