Merge fix for bug 1993. Fix for bug 2707 included in delivery.
<?xml version="1.0"?>
<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
<!ENTITY layer_real_source_path "sf/mw/drm" >
]>
<SystemDefinition name="drm" schema="1.5.1">
<systemModel>
<layer name="mw_layer">
<module name="drm">
<unit unitID="sedo.drm" mrp="" bldFile="&layer_real_source_path;/group" name="drm" />
</module>
</layer>
<layer name="api_test_layer">
<module name="drm_test">
<unit unitID="sedo.drm_test" mrp="" bldFile="&layer_real_source_path;/tsrc/group" name="drm_test" />
</module>
</layer>
</systemModel>
</SystemDefinition>