Removes isOS2Valid; resets fsType
Merge pull request #2913 from yurydelendik/combine-os2valid

Removes isOS2Valid; resets fsType
Merge remote-tracking branch 'upstream/master'