Merged 5.1-MC1 (5.1.0) to HEAD (5.1)

119082 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118568 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         118398 gjames: RA-607 BCRYPT Improved the logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/rest/api/impl/SitesImpl.java

@@ -73,6 +73,8 @@ import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Centralises access to site services and maps between representations.
@@ -84,6 +86,7 @@ public class SitesImpl implements Sites
 {
     private static final String FAVOURITE_SITES_PREFIX = "org.alfresco.share.sites.favourites.";
     private static final int FAVOURITE_SITES_PREFIX_LENGTH = FAVOURITE_SITES_PREFIX.length();
+    private static final Log logger = LogFactory.getLog(SitesImpl.class);
 
     protected Nodes nodes;
     protected People people;
@@ -282,6 +285,7 @@ public class SitesImpl implements Sites
         }
         siteId = siteInfo.getShortName();
 
+        logger.debug("Getting member role for "+siteId+ " person "+personId);
     	String role = siteService.getMembersRole(siteId, personId);
     	if(role != null)
     	{
@@ -289,6 +293,7 @@ public class SitesImpl implements Sites
     	}
     	else
     	{
+            logger.debug("Getting member role but role is null");
     		throw new RelationshipResourceNotFoundException(personId, siteId);
     	}
         

source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java

@@ -110,7 +110,7 @@ public class PublicApiClient
 		this.rc.set(rc);
 	}
 
-	private RequestContext getRequestContext()
+	public RequestContext getRequestContext()
 	{
 		RequestContext context = rc.get();
 		if(context == null)