[COMMIT] Prefer source-directory to source-root; fix find-func for 21.4