This patch merges two similar rules, which create content at 'include' into a single rule. This prevents a possible race condition when creating archives in parallel.
This patch updates the recipes for the base-<kernel> archives to the recently removed os/config.h and os/timeout.h headers.
Issue #2339