Merge pull request #1842 from zzhou1/main
nfsserver: fix "server scope" to live with additional drop-in files