Fixed single model genxml pre-processing workaround to enable single system definition builds. Added "tools" and "adaptation" to the list of packages to be prepended by sf where needed.