Switch "make pluck" to grab from 3.7, since this branch is 3.7.
Regenerate plucked.cf.sub with "make pluck".
Merge pull request #1701 from kacfengine/file_copy_zero_sized_file

Redmine #5763: Regenerate plucked.cf.sub after masterfiles fixes.