Re-merge fixes for bugs 1614 and 2360.
<?xml version="1.0"?>
<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
<!ENTITY layer_real_source_path "addon/custom_sw_tre/easydialing" >
]>
<SystemDefinition name="easydialing" schema="1.4.0">
<systemModel>
<layer name="addon_layer">
<module name="easydialing">
<unit unitID="cusw.easydialing" mrp="" bldFile="&layer_real_source_path;\group" name="easydialing" />
</module>
</layer>
<layer name="api_test_layer">
<module name="easydialing_api_tests">
<unit unitID="easydialing.test" mrp="" bldFile="&layer_real_source_path;\tsrc\t_easydialingplugin\group" name="easydialing_test" />
</module>
</layer>
</systemModel>
</SystemDefinition>