135c135,143
<                 String prefNodePath = MutablePortletEntity.PORTLET_ENTITY_ROOT + "/" + getId() +"/"+ principal.getName() +"/"
---
>                 String principalName;
>                 
>                 if (pac.isMergeSharedPreferences())
>                 {
>                     principalName = NO_PRINCIPAL;
>                 }else{
>                     principalName = principal.getName();
>                 }
>                 String prefNodePath = MutablePortletEntity.PORTLET_ENTITY_ROOT + "/" + getId() +"/"+ principalName +"/"
139a148
>                 /*
143,144c152,153
<                 }
<                 backupValues(preferenceSet);
---
>                 }*/
>                 //backupValues(preferenceSet);
270a280
>         /*
274c284
<         }
---
>         }*/