The "dispute" over the meaning of the word folk is actually over, and has been for a long time--as mentioned above, researchers, academics, anthropologists, ethnomusicologists, have moved on and found other words, and definitions for what they do.

The word "Folk" has pretty much been left for people to use as they please--the discussions about definitions here are pretty much irrelevant to anything--