Merge fix for bug 2631 (included in recent delivery) and workaround for bug 2620.
# commonengine level configuration makefile#Define this platform as default if nothing is definedMAKEFILE = /sf/os/devicesrv/commonservices/commonengine/makefilecommonengine_all :: commonengine_configinclude include_template.mk