PATCH: Arty's fixes based on CMake branch testing. Just the NPFS code. See issue #6103 for more details. svn path=/trunk/; revision=51320