Merge the VFSNAME file-control addition into the nx-devkit branch.

FossilOrigin-Name: 08c1dc517c1340737a55ad9012b7b06f72899c6f