While there is music that is definitely folk or definitely country the boundary between them is not defined. That's obvious when you have the same performer appearing at a folk festival and a country muster. A couple of Aussies spring to mind straight off - John Williamson, and The Sensitive New Age Cow Persons.
Some of John Denver's work probably fits the bill too.