Make cf-locate traversal order deterministic, to avoid unneeded diffs.

Otherwise we will get a unnecessary diffs very often when we run "make
pluck" in the tests/acceptance directory.
(cherry picked from commit cfd43d1b9587e2e5943c64b058c95c6adcb057bf)
Include "run_*" bundles in plucked.cf.sub, for run_ifdefined.
(cherry picked from commit 57988d3dfd81d3c3b58486f8604d7e23c515fc33)

Conflicts:

	tests/acceptance/Makefile.am
Regenerate plucked.cf.sub from masterfiles.