Merge changes I487ebe67,Ie7a0aeb2

* changes:
  libutils: FileMap styling adjustments
  libutils: FileMap 64 bit compile issues