Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

125335 rneamtu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125223 amukha: MNT-15743: documentlibrary generation anomaly in Share
         - Added a check to ensure that a proper doc lib container would be created.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/site/SiteServiceImpl.java

@@ -2569,6 +2569,10 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
         // Check for the component id
         ParameterCheck.mandatoryString("componentId", componentId);
 
+        // use the correct container for doclib
+        // MNT-15743
+        componentId = componentId.toLowerCase().equals(DOCUMENT_LIBRARY.toLowerCase()) ? DOCUMENT_LIBRARY : componentId;
+
         // retrieve site
         NodeRef siteNodeRef = getSiteNodeRef(shortName);
         if (siteNodeRef == null)