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.
Include "run_*" bundles in plucked.cf.sub, for run_ifdefined.
Regenerate plucked.cf.sub from masterfiles.
Merge pull request #2051 from kacfengine/regenerate_plucked_cf_sub

Regenerate plucked cf sub