rutil: FileSystem.cxx: correct merge error

git-svn-id: https://svn.resiprocate.org/rep/resiprocate/main@10609 ddefafc4-47db-0310-ae44-fa13212b10f2
rutil: resipfaststreams.hxx: simplify using stdint types

git-svn-id: https://svn.resiprocate.org/rep/resiprocate/main@10610 ddefafc4-47db-0310-ae44-fa13212b10f2