(PUP-716) Fix reference to FileSystem::File in implementation

This also removed the file_2.rb that was merged into Puppet::FileSystem
(PUP-716) Remove references to FileSystem::File in non code