inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-22 15:12:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,500 Commits 338 Branches 2,260 Tags
934fd3414e37c8271a45642e2cc85424a7e15df4
Commit Graph

6 Commits

Author SHA1 Message Date
Raluca Munteanu
6afb44e712 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 13:45:01 +00:00
Raluca Munteanu
dc6b2852d0 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 13:03:25 +00:00
Raluca Munteanu
8674e2bfc8 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2016-04-26 12:48:49 +00:00
Jan Vonka
32586e279f Merged BRANCHES/DEV/CONV_HEAD to HEAD: 
48314: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 
        47545: Merged DEV/CLOUD2 to DEV/CONV_V413
           43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
              39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                   Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                     36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                        - Will be revisited to add better comments
                     36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                        - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                        - Better code documentation
                        - Removed dev/test code
                        - Improved error config handling
                     36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                        - Changed "link" parameter to "href" (instead of "page") to match actions.
                     39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                     39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
              39875: Configurtion changes to enable Google Docs V2 within the web tier.
              39881: It's extension ... not extention
              39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
              39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
              40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
              40624: Update Google Docs AMPs
              40635: Merge Google Docs Cloud AMPS to Feature Branchs
              40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
              40897: Google Docs AMP update 
              41165: Merge Updated AMPs for [GOOGLEDOCS-83]
              41179: Update AMPs for [GOOGLEDOCS-87]
              41262: Update AMPs for GOOGLEDOCS-89
              41493: Update AMPs for [GOOGLEDOCS-93]
              41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
              41805: Update AMPs for [GOOGLEDOCS-101]
              41840: Add AMPs with i18n strings
              43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
              43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
              43320: Add googledocs repo declaration
   48315: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47438: Merged DEV/CLOUD2 to DEV/CONV_V413
             42160: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                38864: CLOUD-41 - Resize logo banner on upload
                38878: CLOUD-42 - Image previews should be larger
   48316: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47558: Merged DEV/CLOUD2 to DEV/CONV_V413 (RECORD ONLY)
           47542: Overriding entire surf-config.xml (instead of modifying the core slingshot code) with a copy of the core code modified to fit the cloud requirements.
   48318: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY)
        47613: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           47610: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD2:
                47157: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/CLOUD1:
                     44058: Creating DEV/FEATURES/CLOUD1_SAML1 branch from revision 44032 of CLOUD1 b316
                     44095: Cloud SAML: Repo SAML Auth API - webscript placeholders (for SSO/SLO request/response)
                     44177: Cloud SAML: Repo SAML Auth API - webscript placeholders (for SSO request/response)
                     44227: SAML - Share implementation - Note WIP!
                     44249: Cloud SAML: Repo SAML Auth API - skeleton SAMLConfigAdminService (enable/disable)
                     44273: CLOUD-1000, CLOUD-1002: added SAML SSO services to Thor.
                     44274: Added opensaml libs to the build file.
                     44284: Added opensaml dependency, to fix the failed build.
                     44298: Cloud SAML: Repo SAML SSO (Auth) API -  check whether network/tenant is SAML-enabled or not (CLOUD-1018)
                     44315: added jks keystore.
                     44323: added correct version of saml.keystore.jks
                     44350: Changed the issuer.name in the sp-config, and the alias in the key store to reflect the issuer name.
                     44351: Changed the key store type to JKS.
                     44440: Cloud SAML: Share SAML - follow-on to r44227 to fix/add missing SAML authnRequest fields (CLOUD-1039)
                     44448: Cloud SAML: Repo SAML SSO Authn Request (CLOUD-998)
                     44477: Cloud SAML: Repo SAML SSO Authn Response (CLOUD-999)
                     44524: Made SAMLAuthnResponseController to redirect Idps Response to repo. Also added idps.properties file in order to test multiple IdPs.
                     44588: Cloud SAML: Repo SAML - minor: change REST urls from ".../cloud/saml/..." to just ".../saml/..."
                     44609: CLOUD-1002: Modified SAMLResponse processing implementation to get the SAMLResponse from share via json rather than directly through HttpServletRequest that OpenSAML requires.
                     44611: Added a few modifications to improve SAMLHttpPostSimpleSignDecoder implementation.
                     44633: CLOUD-1070: SAML sprint 4: Repo REST - Get SP (Alfresco) Public Certificate
                     44634: Modified ACS post json data, to endued null for non-existent user.
                     44635: CLOUD-1040 "SAML sprint 4: Share UI (SAML-based login) - handle SAML auth response (IdP -> Repo)" checkpoint/wip
                     44645: Cloud SAML: Repo REST API - Get SP (Alfresco) metadata (specific to Network)
                     44684: Cloud SAML: CLOUD-1053 - Email links (signup/invite)
                     44703: Cloud SAML: CLOUD-1058 - Repo REST API to Get SP (Alfresco) metadata (specific to Network)
                     44717: Cloud SAML: CLOUD-1079 - additional login validation when Registering/Creating a new user for a IdP/SAML-enabled Network
                     44721: Modified SAML admin config to include the required attributes to set SSO. The most important attributes are ssoEnabled and IdP’s SSO URL. For setting the attributes, see the wiki page. Note: IdP's certificate uploading/storing hasn't been implemented yet.
                     44739: Cloud SAML: CLOUD-1079 - additional login validation when Registering/Creating a new user for a IdP/SAML-enabled Network
                     44774: Cloud SAML: CLOUD-1053 - UI/Email flows when user exists in IdP but not Alfresco => signup/invite + IdP login form + enter profile & activate
                     44793: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled network/tenant (if implied by username)
                     44794: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled network/tenant (if implied by username)
                     44799: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled Network/Tenant (if implied by username and not a Network/Admin)
                     44809: Cloud SAML: CLOUD-1039 - SAML login entrypoint (localhost:8081/share/{network}/saml) 
                     44810: Cloud SAML: minor - comment only
                     44833: Cloud SAML: CLOUD-1053 - UI/Email flows when user exists in IdP but not Alfresco => signup/invite + IdP login form + enter profile & activate
                     44837: Added OpenSAML dependencies into projects.xml.
                     44840: Added a valid certificate to the saml.keystore.jks, as the certificate was expired.
                     
                     44856: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                     44857: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                     44858: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                     44859: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                     44860: (RECORD ONLY) Fix pesky solrcore.properties
                     
                     44896: Cloud SAML: minor comments/descriptor updates for SAML config admin (CLOUD-1051 & CLOUD-1052)
                     44915: Fixed CLOUD-1111 "SAML: Share UI - allow /share/{network} as a SAML entry point (if network is SAML-enabled)"
                     44919: Removed unecessary url encoding of sso & slo urls in json response
                     44926: WIP commit for CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                     44934: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service (WIP)
                     44948: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service (WIP)
                     45027: Fixed CLOUD-1111 "SAML: Share UI - allow /share/{network} as a SAML entry point (if network is SAML-enabled)" part 2
                          - Is now triggered for urls w a trailing slash after the network name, i.e. /share/alfresco.com/
                     45036: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service
                     45058: CLOUD-1051, CLOUD-1052: Added functionalities to store java certificate as content in order to make OpenSAML to validate IdP's signature dynamically.
                     45067: First cut of CLOUD-1051, CLOUD-1052, check-in, included the wrong classes. Added the correct files now.
                     45087: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)" - WIP
                     45143: CLOUD-1052: added functionalities to SAMLConfigAdmin to return the certificate status and expiration date. Also fixed SAMLConfigAdmin update bug.
                     45151: Fixed saml-config-admin-get template.
                     45173: Cloud SAML:  lowercase userId/emailAddress (for SAML requests/responses)
                     45206: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service
                     45229: CLOUD-1090 "SAML: SLO (SingleLogOut) - Share UI - Logout (SP-initiated)" - WIP
                     45240: CLOUD-1051: Added functionalities to handle multipart form-data submitted by SAML Config Admin screen.
                     45262: Cloud SAML: CLOUD-1129 - SLO - use "session index" (from original SSO) in logout request
                     45269: Added edit-cancel-16.png icon
                     45270: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                     45276: CLOUD-1090 "SAML: SLO (SingleLogOut) - Share UI - Logout (SP-initiated)"
                     45279: Adding common download file icon
                     45280: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                     45281: Cloud SAML: CLOUD-1088 - Repo REST/Services for SLO - fix to invalidate user's current ticket ...
                     45284: CLOUD-1146: Upgraded commons-codec from 1.4 to 1.5
                     45285: Fix pesky solrcore.properties
                     45288: CLOUD-1146: Upgraded commons-codec from 1.4 to 1.5
                     45305: Cloud SAML: CLOUD-1088 - Repo REST/Services for SLO - check SAML logout response (status code) and throw exception
                     45311: CLOUD-1051: Added functionalities to support DER-formatted certificate upload.
                     45314: Prepared config admin screen download links to use the attached header, so they become proper download links (rather than "view in browser" links)
                     45320: Updating certificate input field label after request form Jamal to "Upload to IdP certificate"
                     45321: Fine tuning the certificate label for Jamal, hopefully he's happy with this version :-)
                     45322: CLOUD-1112 "SAML: Share UI: updated profile page - to explain to user's that they're entering an Alfresco password"
                     45327: CLOUD-1113 "SAML: Share UI - updated Change Password page"
                     45341: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                     45353: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                          - Added additional field for IDP initiated logout request
                          - Refactored field name for SP initiated logout request
                     45365: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                     45372: CLOUD-1109 "SAML: Share UI - New user - login + profile page (without requiring a signup/invite email link)"
                     45374: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                     45377: CLOUD-1052: Fixed enable/disable SAML SSO config page for an existing SAML setup.
                     45390: CLOUD-1051, CLOUD-1052: Added support for IdP SLO response URL. Also, renamed idpSloURL to be idpSloRequestURL.
                     45391: Cloud SAML: CLOUD-1158 - Repo-side to allow SP cert/metadata links to be downloaded rather than just viewed (in Share)
                     45403: Refactored urls before implementing idp initiated logouts to avoid name clashes
                     45429: CLOUD-1128 "SAML: SLO (SingleLogOut) - Share UI - handle SAML logout request (IdP-initated)"
                          - Note! Share SAML SP Service urls have been changed and needs to be (re)configured in the IDP:
                             * Assertion Consumer Service URL 
                               - Endpoint URL: /share/alfresco.com/saml/authnresponse (POST)
                             * SLO Service URLs 
                               - Endpoint URL: /share/alfresco.com/saml/logoutrequest (POST) 
                               - Response URL: /share/alfresco.com/saml/logoutresponse (POST)
                     45433: CLOUD-1069 "SAML: draft text for Network Admin screen - field names / "i"nfo pop-up"
                     45464: Improved error test for saml settings screen.
                     45465: CLOUD-1135 "SAML: SLO (SingleLogOut) - Share UI - error/warning page if SLO fails unexpectedly" part 1 of 2
                     45490: CLOUD-1181: Fixed IdP initiated SLO, by adding RelayState.
                     45492: Message component improvements and a generic guest message page
                     45493: CLOUD-1135 "SAML: SLO (SingleLogOut) - Share UI - error/warning page if SLO fails unexpectedly" part 2 of 2
                     45524: Cloud SAML: CLOUD-1191 - initial fix for SLO error (affects PingFederate, not OpenAM) due to multiple sessionIndexes
                     45552: Making callback pattern consistent with the pattern that should be used in all other multipart webscripts
                     45639: Cloud SAML: CLOUD-1192 - Improve Repo INFO logging - eg. also show Assertion ID (as requested by customer/partner)
                     45647: CLOUD-1091: Changed SAML keystore loading functionalities, to use existing alf keystore.
                     45684: CLOUD-1213: Added support for Network-Specific SP entityID. 
                     45704: Cloud SAML: CLOUD-1209 - SLO failure after directly activating a new user (ie. login + complete profile)
                47164: Fix SVN merge
                47168: Fix merge/test
                47250: Fix merge issue (remove unwanted files)
                47444: Fixes: CLOUD-1397: Incorrectly encoded copyright messages.
                47462: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/CLOUD1:
                     47461: Share fix for: CLOUD-1399: Check tenant is SAML enabled before getting IDP details
                47467: Repo fix for: CLOUD-1399: Reduce ERROR/stacktrace to one line WARN if non-SAML enabled network tries to access repo saml web script
                47502: Fixes CLOUD-1397: corrects copyright encoding in Share footer.
   48319: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (already up-to-date - effectively a record-only)
        47403: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             42199: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                  41113: Creating new [bug fix] branch from BRANCHES/DEV/CLOUD1
                  41211: QuickShare: CLOUD-593: prevent copying of QuickShare props on node copy [+ minor refactor]
                  41612: QuickShare: Merged form THOR1_QUICK_SHARE to CLOUD1-BUG-FIX
                     36363: QuickShare: Improvment for THOR-1268 "F378: As a user I can choose to share a document"
                  41639: QuickShare: Fixed bug where the display of quickshare was based on the showComments property
   48320: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes)
        47404: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             42204: Merged BRANCHES/DEV/HEAD_QUICK_SHARE_TMP to BRANCHES/DEV/CLOUD1:
                  41733: QuickShare: fix ShareContentGet NPE (fix for Document Details redirect if logged in)
   48324: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47453: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                  43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                             V4.0-BUG_FIX
                                 36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                 36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                 36608: First part of ALF-14209 SOLR - does not support query for all stores
                                 36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                 36954: ALF-14209 SOLR - does not support query for all stores
                                 37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                 37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                 37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                 37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                 37628: Build Fix
                                 37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                 37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                 37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                 38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                 38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                             V4.1
                                 38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                             V4.1-BUG-FIX
                                 40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                 41201: Fix for ALF-15767 Group query using cm:authorityName
                                 41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                 41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                 41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                 41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                 41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                 41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                 41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                        Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                 41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                 41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                        Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                 41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                 41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                 41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                 42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                 42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                 42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                       42547: Fix the model used for embedded tests.
                       42659: Add missing test model
                       42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                             42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                             42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                       42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                             working copy sync r42514 through r42659
                  43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            42363: ALF-16213: renaming versioned file results in file being deleted.
                       42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX:
                                 42389: CLOUD-796: handle unknown custom content/folder type
                                 42396: CLOUD-796: handle unknown custom content/folder type
                                 42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                      41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly
                                 42406: CLOUD-796: handle unknown custom content/folder type
                             42409: CloudSync: CLOUD-796 / ALF-16226 -  hide sync props in forms (eg. edit props) for sync'ed custom content type
                       42428: ALF-16217: Remove unnecessary restriction on content type
                       42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                  43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                       42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                  43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                  43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                       42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                       42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                  43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                  43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                  43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                       42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                       42868: Fix failing build tests + further/revised public api tests
                       42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                       42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                       42899: Fix build
                  43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                  43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                       43234: CLOUD-313: Implment Transport pooling in email sender.
                       43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                       43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                       43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                       43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                  43819: Fix merge error
                  43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                  43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                               39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                               39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                       43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                  43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                            43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                               - Patched POI to:
                                 - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                 - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                 - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                 - handle -ve fractions (just did not work)
                                 - limitations:
                                   - custom text gets stripped (still better than before)
                                   - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                       43564: CLOUD-939: <Record Only>
                            43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                               - Original jar did not get removed in previous commit
                               << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                  43823: Fix merge error
                  43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43579: Public api test, fix intermittent test failures (hopefully)
                       43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                       43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                  43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                  43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                       43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                       43762: Fix the build
                  43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                 39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                    - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that
                                      much slower even for western encodings
                                      - It still does csv and xml to pdf
                                      - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf)
                                        The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used.
                                      - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason.
                                      - transformer.complex.Text.Image now has a wild card first transformer for the same reason.
                                    - Allow transformer config element supportedTransformations to wild card source or target mimetype
                            39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                 39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                    - Fix build failures (not sure about RecordsManagementAuditServiceImplTest)
                                    - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox
                            40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                 40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                    - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                 40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                    - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                      including fixes that existed on only one or the other.
                                    - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                      an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                       43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                  43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                  43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43762: Fix the build
                  43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            40859: public api:
                            40862: CLOUD-555: "Updating comment fails because node not found"
                            40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                            40979: Added tests for non-numeric params and non-european characters
                            41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                 41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                            41097: Added quickshare and cloudsync to cmis filter list
                            41098: Renamed serializer/deserializer lists for RestJsonModule
                            41099: Cleaned up consistent Rest responses - CLOUD-574
                            41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                            41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                            41105: Added key for trusted layer7 relationship
                            41137: Public api:
                            41146: Fix trusted authentication against OpenCMIS
                            41168: Public apI;
                            41169: CLOUD-565: "API / URL returns a "tenant required" error"
                            41170: public api:
                            41171: public api:
                            41172: public api:
                            41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                            41186: Fix solrcore properties
                            41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                            41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                            41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                            41325: Public api:
                            41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                            41369: Public api:
                            41422: Sample OAuth call for the Resource Owner Password flow
                            41427: Sample OAuth call for the Client Credentials flow
                            41433: Public api: (1) parameterize site members/people sorting in service api
                            41434: Public api: minor comment service fix
                            41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                            41439: Public api: fix for default tenant id in CMIS requests
                            41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                            41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                            41457: Fix build
                            41461: Public api: more tests
                            41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                            41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                            41607: CLOUD-668 : changed ordering so errors fire in correct order.
                            41628: Public api: more tests
                            41672: CLOUD-672: "404 Error when browsing child files/folder "
                            41673: Public api: more tests
                            41675: CLOUD-674: "Root network calls need to return application/json content type"
                            41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                            41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                            41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                            41823: Public api: more tests
                            41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                            41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                            41867: CLOUD-711: "It should be possible to remove a favourite site"
                            41957: Public api: - error handling improvements - more tests
                            41970: Public api: - fix build  (add missing files)
                            41972: Public api: - more tests (including OpenCMIS TCK)
                            42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                            42058: Public api: changed logging package name
                            42124: Public api: - more tests - minor fixes
                            42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                            42126: Public api: fix up OpenCMIS tests
                            42171: Consistency fix for CLOUD-695.
                            42180: Fix build
                            42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                            42214: Public api tests (cmis)
                            42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                            42253: Fix build
                       42735: (RECORD ONLY) Fix build (fix merge error)
                  43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                       43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                       43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                  43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                  43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                  43881: Revert CLOUD-942: Reverse merge r43830 
                  43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                  43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                  43924: Disable intermittent OpenCMIS tests
                  43925: Disable intermittent test
                  43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                  43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
   48327: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47496: CONV: Fix build/tests - AVMLockingServiceTest testLockModification & AVMLockingServiceTest testGroupBasedLocking
        47505: Resolve 3rd party lib (commons-pool) issue within eclipse (ensure exported)
        47512: Fix build/tests
   48328: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47525: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             45271: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                  44289: PUBLICAPI-43: "CMIS endpoints need to report incorrect methods as a 405 error"
                  44707: PUBLICAPI-56: "Creating comments can fail intermittently"
                       - tests to follow
                  44742: CLOUD-1073: "Unable to upload documents intermittently"
                  45070: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: (PUBLICAPI-57)
                       Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                          44688: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                          44689: [CLOUD-1072] Add public api url to CORS filter mapping. Move CORS filter mapping to live above the publicapi filter mappings. OPTIONS calls made to the CORS filter should be evaluated before Layer7 authentication.
                  45168: CLOUD-1140: Activities PostLookup : "Skipping activity post 1234567"and occasionally "Exception during update of posts" (due to InvalidNodeRefException)
                  45169: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45082: CLOUD-1139: Cloud feednotifier running on 2 boxes
   48333: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47530: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             45853: Merged BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH to BRANCHES/DEV/CLOUD1:
                  44041: Merged BRANCHES/DEV/CLOUD1_SPRINT1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                       40496: Merged from BRANCHES/DEV/AMILLER/CLOUD1_SPRINT_1 to BRANCHED/DEV/CLOUD1_SPRINT1
                            CLOUD-189: Created e-mail template macros and css lib files
                            CLOUD-189: E-mail template image assets
                            CLOUD-189: Updated macros and CSS lib plus finished site invitation template
                            CLOUD-189: Reset password e-mails
                            CLOUD-189: More e-mail templates
                            CLOUD-189: Workflow template
                            CLOUD-144: Refactor AbstractUserNotifier to allow custom models to be passed to template.
                            CLOUD-144: Custom activity feed model builder, for cloud.
                            CLOUD-144: Activities e-mail template
                       40958: CLOUD-580: Added alt text for images
                       40960: CLOUD-585: Added missing quotes to invitation e-mail
                       40967: CLOUD-144: Add joins aggregation to activites feed model and fix missed merge.
                       40970: CLOUD-144: Added joins to activities e-mail
                       40982: CLOUD-582: Fix subject
                       41028: CLOUD-582: Fix unit test assertion on email subject
                       41231: CLOUD-612: Add generation time to model.
                       41276: CLOUD-612: Added date to activity e-mail template
                       41279: CLOUD-614: Added missing footer text to activities e-mail
                       41502: CLOUD-611: Remove corner images
                       41728: CLOUD-681: Add others category to activities e-mail
                       42138: CLOUD-613: Remove exclusions from site activities, sort grouping by site name and improve logic for determining network.
                       42196: CLOUD-613: Group activities by site
                       42914: Translated e-mail templates
                  44174: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                       43983: GERMAN: Translation updates based on EN r43703
                       43984: SPANISH: Translation updates based on EN r43703
                       43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                       43986: ITALIAN: Translation updates based on EN r43703.
                       43987: JAPANESE: Translation updates based on EN r43703.
                       43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                       44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                       44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                       44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                       44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                            43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                       V4.0-BUG_FIX
                                           36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                           36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                           36608: First part of ALF-14209 SOLR - does not support query for all stores
                                           36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                           36954: ALF-14209 SOLR - does not support query for all stores
                                           37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                           37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                           37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                           37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                           37628: Build Fix
                                           37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                           37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                           37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                           38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                           38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                       V4.1
                                           38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                       V4.1-BUG-FIX
                                           40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                           41201: Fix for ALF-15767 Group query using cm:authorityName
                                           41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                           41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                           41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                           41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                           41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                           41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                  Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                           41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                           41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                  Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                           41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                           41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                           42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                 42547: Fix the model used for embedded tests.
                                 42659: Add missing test model
                                 42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                       42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                       42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                 42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                       working copy sync r42514 through r42659
                            43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      42363: ALF-16213: renaming versioned file results in file being deleted.
                                 42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX:
                                           42389: CLOUD-796: handle unknown custom content/folder type
                                           42396: CLOUD-796: handle unknown custom content/folder type
                                           42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly
                                           42406: CLOUD-796: handle unknown custom content/folder type
                                       42409: CloudSync: CLOUD-796 / ALF-16226 -  hide sync props in forms (eg. edit props) for sync'ed custom content type
                                 42428: ALF-16217: Remove unnecessary restriction on content type
                                 42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                            43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                 42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                            43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                            43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                 42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                 42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                            43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                            43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                            43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                 42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                 42868: Fix failing build tests + further/revised public api tests
                                 42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                 42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                 42899: Fix build
                            43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                            43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                 43234: CLOUD-313: Implment Transport pooling in email sender.
                                 43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                 43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                 43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                 43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                            43819: Fix merge error
                            43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                         39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                         39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                      43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                         - Patched POI to:
                                           - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                           - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                           - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                           - handle -ve fractions (just did not work)
                                           - limitations:
                                             - custom text gets stripped (still better than before)
                                             - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                 43564: CLOUD-939: <Record Only>
                                      43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                         - Original jar did not get removed in previous commit
                                         << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                            43823: Fix merge error
                            43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43579: Public api test, fix intermittent test failures (hopefully)
                                 43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                 43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                            43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                            43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                 43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                 43762: Fix the build
                            43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                           39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                              - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that
                                                much slower even for western encodings
                                                - It still does csv and xml to pdf
                                                - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf)
                                                  The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used.
                                                - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason.
                                                - transformer.complex.Text.Image now has a wild card first transformer for the same reason.
                                              - Allow transformer config element supportedTransformations to wild card source or target mimetype
                                      39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                           39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                              - Fix build failures (not sure about RecordsManagementAuditServiceImplTest)
                                              - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox
                                      40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                           40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                              - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                           40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                              - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                including fixes that existed on only one or the other.
                                              - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                 43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                            43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43762: Fix the build
                            43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      40859: public api:
                                      40862: CLOUD-555: "Updating comment fails because node not found"
                                      40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                      40979: Added tests for non-numeric params and non-european characters
                                      41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                           41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                      41097: Added quickshare and cloudsync to cmis filter list
                                      41098: Renamed serializer/deserializer lists for RestJsonModule
                                      41099: Cleaned up consistent Rest responses - CLOUD-574
                                      41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                      41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                      41105: Added key for trusted layer7 relationship
                                      41137: Public api:
                                      41146: Fix trusted authentication against OpenCMIS
                                      41168: Public apI;
                                      41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                      41170: public api:
                                      41171: public api:
                                      41172: public api:
                                      41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                      41186: Fix solrcore properties
                                      41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                      41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                      41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                      41325: Public api:
                                      41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                      41369: Public api:
                                      41422: Sample OAuth call for the Resource Owner Password flow
                                      41427: Sample OAuth call for the Client Credentials flow
                                      41433: Public api: (1) parameterize site members/people sorting in service api
                                      41434: Public api: minor comment service fix
                                      41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41439: Public api: fix for default tenant id in CMIS requests
                                      41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                      41457: Fix build
                                      41461: Public api: more tests
                                      41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                      41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                      41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                      41628: Public api: more tests
                                      41672: CLOUD-672: "404 Error when browsing child files/folder "
                                      41673: Public api: more tests
                                      41675: CLOUD-674: "Root network calls need to return application/json content type"
                                      41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41823: Public api: more tests
                                      41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                      41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                      41867: CLOUD-711: "It should be possible to remove a favourite site"
                                      41957: Public api: - error handling improvements - more tests
                                      41970: Public api: - fix build  (add missing files)
                                      41972: Public api: - more tests (including OpenCMIS TCK)
                                      42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                      42058: Public api: changed logging package name
                                      42124: Public api: - more tests - minor fixes
                                      42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                      42126: Public api: fix up OpenCMIS tests
                                      42171: Consistency fix for CLOUD-695.
                                      42180: Fix build
                                      42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                      42214: Public api tests (cmis)
                                      42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                      42253: Fix build
                                 42735: (RECORD ONLY) Fix build (fix merge error)
                            43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                 43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                 43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                            43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                            43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                            43881: Revert CLOUD-942: Reverse merge r43830 
                            43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                            43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                            43924: Disable intermittent OpenCMIS tests
                            43925: Disable intermittent test
                            43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                            43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                  44185: Merged BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                       43021: CLOUD-803, CLOUD-487: Send localised e-mails
                       43024: CLOUD-486 - Choose UI language.
                       43085: CLOUD-803, CLOUD-487: Revert changes to pre-existing process(String, Object, Writer) method.
                       43086: CLOUD-803, CLOUD-487: Fix broken unit tests
                       43106: CLOUD-486 - Choose UI language.
                       43159: CLOUD-486 - Choose UI language.
                       43160: CLOUD-803, CLOUD-487: Fix broken unit tests
                       43182: CLOUD-803, CLOUD-487: Fix broken unit tests.
                       43230: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                       43246: Bug fix for CLOUD-899.  Added if to catch null values.
                       43267: CLOUD-486 - Choose UI language.
                       43329: CLOUD-911 - Localization change is not working in the preference page from CLOUD-486 - Fixed by setting cookie path to /
                       43626: CLOUD-909 - Keep Email address when language changes
                       43631: CLOUD-909 - Keep Email address when language changes - Updated Spring Surf version
                       43704: Enables all currently cloud supported languages in Cloud specific config file
                       43723: CLOUD-486 - Fix right border of select options and add extra languages
                       43880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            43879: FRENCH: Translation updates based on EN r43703
                       43965: CLOUD-486 - Add French, German, Spanish, Italian and Japanese for new fields and pages.
                       43988: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            43983: GERMAN: Translation updates based on EN r43703
                            43984: SPANISH: Translation updates based on EN r43703
                            43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                            43986: ITALIAN: Translation updates based on EN r43703.
                            43987: JAPANESE: Translation updates based on EN r43703.
                       44021: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            42871: GERMAN: Cloud Translation, based on r 42416
                            42879: SPANISH: Cloud Translation, based on r 42416
                            42890: ITALIAN: Cloud Translation, based on r 42416
                       44026: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                       44033: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                            44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                       44077: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                       44093: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch
                            42871: (RECORD ONLY) GERMAN: Cloud Translation, based on r 42416
                            42879: (RECORD ONLY) SPANISH: Cloud Translation, based on r 42416
                            42890: (RECORD ONLY) ITALIAN: Cloud Translation, based on r 42416
                            43120: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                                 43100: Update the salesforce amp to include the CORS Filter
                                 43101: Update web.xml to enable to the CORS Filter with filter-mapping
                                 43117: Add updated amp with removed CORS Filter.  CORS Filter is now available in 3rd-party libs
                                 43118: [CLOUD-724] Add CORS Filter jar to 3rd-party libs
                                 43119: [CLOUD-724] Add missing jar java-property-utils-1.6.jar to 3rd-party libs
                            43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers
                            43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
                                 42257: CLOUD-649: Updates UI action for Granular Permissions
                                 42295: CLOUD-33: Updates labels
                                 42303: CLOUD-651: Limit user search to site members only.
                                 42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
                                 42427: Removes multi-select manage-permissions dialogue.
                                 42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
                                 42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
                                 42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
                                 42807: CLOUD-863: Reordered code to avoid AccessDeniedException
                                 43259: CLOUD-901: Revert showComments check so it handles undefined permission
                                 43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
                                 43307: CLOUD-900: Follow-up fix
                            43353: Fix for remote transform server with new cloud environment
                            43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
                                 39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                                      Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                                        36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                                           - Will be revisited to add better comments
                                        36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                                           - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                                           - Better code documentation
                                           - Removed dev/test code
                                           - Improved error config handling
                                        36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                                           - Changed "link" parameter to "href" (instead of "page") to match actions.
                                        39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                                        39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
                                 39875: Configurtion changes to enable Google Docs V2 within the web tier.
                                 39881: It's extension ... not extention
                                 39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
                                 39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
                                 40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
                                 40624: Update Google Docs AMPs
                                 40635: Merge Google Docs Cloud AMPS to Feature Branchs
                                 40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
                                 40897: Google Docs AMP update 
                                 41165: Merge Updated AMPs for [GOOGLEDOCS-83]
                                 41179: Update AMPs for [GOOGLEDOCS-87]
                                 41262: Update AMPs for GOOGLEDOCS-89
                                 41493: Update AMPs for [GOOGLEDOCS-93]
                                 41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
                                 41805: Update AMPs for [GOOGLEDOCS-101]
                                 41840: Add AMPs with i18n strings
                                 43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
                                 43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
                                 43320: Add googledocs repo declaration
                            43538: Fix pesky solrcore.properties ... remove hardcoded amiller ;-)
                            43605: Merged BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK to BRANCHES/DEV/CLOUD1:
                                 43033: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK:
                                      39313: CLOUD-194: Add new trial network account type.
                                      39332: CLOUD-194: Add translation for new network account type.
                                 43218: CLOUD-194: Change Trail Network subscription level to Enterprise
                            43658: Merged HEAD to BRANCHES/DEV/CLOUD1:
                                 43655: BDE-73: exclude more failing tests which are never run
                                 43653: BDE-73: tune surefire config to make it pass with Sonar 3.3
                            43752: Merged HEAD to CLOUD1
                                 BDE-73: Repair coverage report, broken since Sonar upgrade   
                            43879: (RECORD ONLY) FRENCH: Translation updates based on EN r43703
                            43983: (RECORD ONLY) GERMAN: Translation updates based on EN r43703
                            43984: (RECORD ONLY) SPANISH: Translation updates based on EN r43703
                            43985: (RECORD ONLY) FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                            43986: (RECORD ONLY) ITALIAN: Translation updates based on EN r43703.
                            43987: (RECORD ONLY) JAPANESE: Translation updates based on EN r43703.
                            43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                            44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                                 43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                            V4.0-BUG_FIX
                                                36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                                36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                                36608: First part of ALF-14209 SOLR - does not support query for all stores
                                                36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                                36954: ALF-14209 SOLR - does not support query for all stores
                                                37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                                37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                                37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                                37628: Build Fix
                                                37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                                37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                                38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                            V4.1
                                                38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                            V4.1-BUG-FIX
                                                40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                                41201: Fix for ALF-15767 Group query using cm:authorityName
                                                41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                                41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                                41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                                41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                                41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                       Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                                41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                                41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                       Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                                41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                                42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                      42547: Fix the model used for embedded tests.
                                      42659: Add missing test model
                                      42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                            42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                            42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                      42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                            working copy sync r42514 through r42659
                                 43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           42363: ALF-16213: renaming versioned file results in file being deleted.
                                      42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX:
                                                42389: CLOUD-796: handle unknown custom content/folder type
                                                42396: CLOUD-796: handle unknown custom content/folder type
                                                42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly
                                                42406: CLOUD-796: handle unknown custom content/folder type
                                            42409: CloudSync: CLOUD-796 / ALF-16226 -  hide sync props in forms (eg. edit props) for sync'ed custom content type
                                      42428: ALF-16217: Remove unnecessary restriction on content type
                                      42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                                 43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                      42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                                 43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                                 43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                      42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                      42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                                 43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                                 43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                                 43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                      42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                      42868: Fix failing build tests + further/revised public api tests
                                      42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                      42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                      42899: Fix build
                                 43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                                 43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                      43234: CLOUD-313: Implment Transport pooling in email sender.
                                      43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                      43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                      43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                      43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                                 43819: Fix merge error
                                 43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                 43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                              39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                              39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                      43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                 43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                           43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                              - Patched POI to:
                                                - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                                - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                                - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                                - handle -ve fractions (just did not work)
                                                - limitations:
                                                  - custom text gets stripped (still better than before)
                                                  - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                      43564: CLOUD-939: <Record Only>
                                           43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                              - Original jar did not get removed in previous commit
                                              << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                                 43823: Fix merge error
                                 43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43579: Public api test, fix intermittent test failures (hopefully)
                                      43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                      43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                 43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                                 43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                      43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                      43762: Fix the build
                                 43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                                   - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that
                                                     much slower even for western encodings
                                                     - It still does csv and xml to pdf
                                                     - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf)
                                                       The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used.
                                                     - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason.
                                                     - transformer.complex.Text.Image now has a wild card first transformer for the same reason.
                                                   - Allow transformer config element supportedTransformations to wild card source or target mimetype
                                           39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                                   - Fix build failures (not sure about RecordsManagementAuditServiceImplTest)
                                                   - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox
                                           40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                   - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                                40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                   - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                     including fixes that existed on only one or the other.
                                                   - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                     an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                      43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                                 43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                 43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43762: Fix the build
                                 43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           40859: public api:
                                           40862: CLOUD-555: "Updating comment fails because node not found"
                                           40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                           40979: Added tests for non-numeric params and non-european characters
                                           41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                                41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                           41097: Added quickshare and cloudsync to cmis filter list
                                           41098: Renamed serializer/deserializer lists for RestJsonModule
                                           41099: Cleaned up consistent Rest responses - CLOUD-574
                                           41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                           41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                           41105: Added key for trusted layer7 relationship
                                           41137: Public api:
                                           41146: Fix trusted authentication against OpenCMIS
                                           41168: Public apI;
                                           41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                           41170: public api:
                                           41171: public api:
                                           41172: public api:
                                           41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                           41186: Fix solrcore properties
                                           41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                           41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                           41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                           41325: Public api:
                                           41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                           41369: Public api:
                                           41422: Sample OAuth call for the Resource Owner Password flow
                                           41427: Sample OAuth call for the Client Credentials flow
                                           41433: Public api: (1) parameterize site members/people sorting in service api
                                           41434: Public api: minor comment service fix
                                           41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41439: Public api: fix for default tenant id in CMIS requests
                                           41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                           41457: Fix build
                                           41461: Public api: more tests
                                           41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                           41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                           41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                           41628: Public api: more tests
                                           41672: CLOUD-672: "404 Error when browsing child files/folder "
                                           41673: Public api: more tests
                                           41675: CLOUD-674: "Root network calls need to return application/json content type"
                                           41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41823: Public api: more tests
                                           41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                           41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                           41867: CLOUD-711: "It should be possible to remove a favourite site"
                                           41957: Public api: - error handling improvements - more tests
                                           41970: Public api: - fix build  (add missing files)
                                           41972: Public api: - more tests (including OpenCMIS TCK)
                                           42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                           42058: Public api: changed logging package name
                                           42124: Public api: - more tests - minor fixes
                                           42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                           42126: Public api: fix up OpenCMIS tests
                                           42171: Consistency fix for CLOUD-695.
                                           42180: Fix build
                                           42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                           42214: Public api tests (cmis)
                                           42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                           42253: Fix build
                                      42735: (RECORD ONLY) Fix build (fix merge error)
                                 43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                      43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                      43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                 43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                                 43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                                 43881: Revert CLOUD-942: Reverse merge r43830 
                                 43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                                 43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                                 43924: Disable intermittent OpenCMIS tests
                                 43925: Disable intermittent test
                                 43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                                 43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                  44196: CLOUD-678 - Incorrect link for 'To change your notifications settings, go here.' message
                  44201: CLOUD-486 - Choose UI language
                  44202: CLOUD-487: Fix emails after merge of template refresh and localised mail features
                     44414: JAPANESE: Cloud email template translation
                  44622: Fixes: CLOUD-1037 - removes unnecessary elements from inside the a tag.
                  44623: Cloud-189 - Corrects text and layout for already created email templates.
                  44624: Fixes: CLOUD-1044: Updates Email template
                  44625: Fixes: CLOUD-1042: Updates Email template
                  44626: Fixes: CLOUD-1043: Updates Email template
                  44627: Fixes: CLOUD-1041: Updates Email template
                  44764: CLOUD-1080: Fixes encoding error.
                  44767: CLOUD-1086: Text update to email template
                  44888: Email template updates - fixes CLOUD-1099 and CLOUD-1102.
                  44892: Fixes error with Activities email - the template fails to process if the only activities are based on follow events. It now processes and gets sent, but with some confusion, see CLOUD-1123
                  44914: Fixes CLOUD-1097 - Alt text not displaying due to unspecified image dimensions and colour. Also minor code clean up.
                  45145: CLOUD-1123 - Filter out "Following" activities from activity feed email.
                  45251: Email template text updates following review.
                  45289: Fix issue where email was not sent for 'Invite People'
                  45306: Externalises strings for cloud emails
                  45316: Adds some defensive code to prevent unused variables being a problem for templates.
                  45328: Email translation updates
                  45334: Resolve CLOUD-1162: Ability to change sign-up, reminder and reset password timer durations via properties
                  45369: Fixes Following Email template
                  45376: Resolve CLOUD-1172: Following email does not show domain correctly
                  45401: Corrects layout bug in email template
                  45407: Removes unnecessary full stop.
                  45408: Adds missing email template translations
                  45430: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                       45329: FRENCH: Cloud translation updates based on EN r45266
                       45330: GERMAN: Cloud translation updates based on EN r45266
                       45332: SPANISH: Cloud translation updates based on EN r45266
                       45333: JAPANESE: Cloud translation updates based on EN r45266
                       45427: SPANISH: Cloud 1 translation updates based on EN r45266
                  45453: Fix for CLOUD-1164 - Failed login is not handled correctly (on email refresh branch)
                  45474: Fixes: CLOUD-1189: Incorrect variable used in translated property files.
                  45484: Fixes: CLOUD-1190 incorrect quote marks in JA file
                  45487: CLOUD-1186: Fixes issue with reminder emails not being localised.
                  45501: Potential fix for: CLOUD-678
                  45503: Resolve CLOUD-1188: Emails are not rendered as HTML, even though they are HTML
                  45539: Resolve CLOUD-1195: Invite people email not rendering as HTML, even though it is HTML
                  45559: CLOUD-1197: Fixes issue with reset password template not recognising all the variables in all cases.
                  45579: Resolve CLOUD-1186: Email not localized, CLOUD-1202: Invite people / Invite site email sometimes comes in English and is not localized
                  45609: Resolve test failures introduced fixing CLOUD-1186
                  45613: Resolve CLOUD-1210: Locale is not replicated across tenants if a user has been invited to one or more secondary tenants
                  45616: Resolve CLOUD-1205: activities email template the feed are not localized
                  45642: Fixes: CLOUD-1211 and CLOUD-1212 - externalises two hard coded strings. Translations to follow.
                  45645: CLOUD-1205: activities email template the feed are not localized
                  45646: CLOUD-1203: Invite to Site and site reminder the role should be localized
                  45654: ALL LANG: Translation updates to email templates, following fixes made for CLOUD-1212, CLOUD-1211.
                  45678: Removes hidden chars at start of the file.
                  45680: Fixes more hidden chars that the start of UTF8 files.
                  45683: Fixes: CLOUD-1216: Typo in Italian properties file.
                  45693: Resolve CLOUD-1204: Task type in the workflow emails are not localized
                  45702: Minor translation updates following linguistic review.
                  45717: GERMAN: Translation updates based on linguistic review
                  45719: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1/ to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                       45718: ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import)
                  45797: Resolve CLOUD-1226: The task details are not showing in localized details in task list
                  45798: Fix single quote encoding in language property file (related to CLOUD-1230, but does not resolve it across the board).
        47532: Fix merge/compile error (AlfrescoCmisServiceImpl.java - copyToTempFile/removeTempFile)
        47533: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             46011: Fix NPE while sending emails (in non-test mode)
   48348: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47554: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             46321: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                  44210: CLOUD-957: Insure moderated and private sites' containers do not inherit pemissions from the paernt site, and that group EVERYONE does not have read permisions.
                  44238: CLOUD-957: Fix broken unit test
                  44286: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                  44287: more public api tests
                  44299: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       44280: Fixes: CLOUD-919 - adds defensive code to prevent error if Get Satisfaction script doesn't load.
                  44311: more public api tests - fix build
                  44313: PUBLICAPI-45: "Get Networks Call for Not-Network User Throws NullPointerException"
                  44328: Fixes: CLOUD-1025 - adds meta robot noindex & nofollow tag to global template and excludes it from the login page.
                  44344: more public api tests - fix build
                  44355: Tweak robots metatag: delimit content with a comma.
                  44380: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2
                       44375: Modified large thumbnail generation mimetype from PNG to JPG:
                              - hugely reduces the file size of the 900x900 thumbnail image that is generated for JPG images in the gallery view e.g. uploaded photos
                              - average file size reduced from ~3000K to ~300K for large photo thumbnails
                              - also reduces the time take to generate a page full of large thumbnails in the background from around 20secs to 10secs
                  44388: Updated mimetype to image/jpeg to stop warnings from Chrome
                  44396: Fixes JUnit test (RenditionServiceIntegrationTest)
                  44619: CLOUD-1075: "Bulk filesystem import does not work"
                  44637: CLOUD-1024
                  44685: Fixes: CLOUD-1009 - Visual changes the Quickshare header.
                  44705: CLOUD-1009: Moves gradient to CSS & adds 3d effects suggested by Lee.
                  44706: CLOUD-1009: Bumps up font size as requested by Jessie.
                  45234: Resolve CLOUD-1130: Incorrect copyright message
                  45248: Resolve CLOUD-1077: File size limits for Transforms need increasing for Cloud
                  45337: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43879: FRENCH: Translation updates based on EN r43703
                       43983: GERMAN: Translation updates based on EN r43703
                       43984: SPANISH: Translation updates based on EN r43703
                       43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                       43986: ITALIAN: Translation updates based on EN r43703.
                       43987: JAPANESE: Translation updates based on EN r43703.
                       43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                       44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                       44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                       44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                       44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                            43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                       V4.0-BUG_FIX
                                           36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                           36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                           36608: First part of ALF-14209 SOLR - does not support query for all stores
                                           36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                           36954: ALF-14209 SOLR - does not support query for all stores
                                           37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                           37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                           37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                           37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                           37628: Build Fix
                                           37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                           37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                           37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                           38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                           38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                       V4.1
                                           38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                       V4.1-BUG-FIX
                                           40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                           41201: Fix for ALF-15767 Group query using cm:authorityName
                                           41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                           41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                           41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                           41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                           41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                           41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                  Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                           41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                           41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                  Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                           41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                           41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                           42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                 42547: Fix the model used for embedded tests.
                                 42659: Add missing test model
                                 42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                       42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                       42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                 42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                       working copy sync r42514 through r42659
                            43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      42363: ALF-16213: renaming versioned file results in file being deleted.
                                 42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX:
                                           42389: CLOUD-796: handle unknown custom content/folder type
                                           42396: CLOUD-796: handle unknown custom content/folder type
                                           42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly
                                           42406: CLOUD-796: handle unknown custom content/folder type
                                       42409: CloudSync: CLOUD-796 / ALF-16226 -  hide sync props in forms (eg. edit props) for sync'ed custom content type
                                 42428: ALF-16217: Remove unnecessary restriction on content type
                                 42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                            43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                 42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                            43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                            43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                 42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                 42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                            43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                            43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                            43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                 42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                 42868: Fix failing build tests + further/revised public api tests
                                 42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                 42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                 42899: Fix build
                            43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                            43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                 43234: CLOUD-313: Implment Transport pooling in email sender.
                                 43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                 43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                 43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                 43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                            43819: Fix merge error
                            43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                         39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                         39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                      43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                         - Patched POI to:
                                           - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                           - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                           - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                           - handle -ve fractions (just did not work)
                                           - limitations:
                                             - custom text gets stripped (still better than before)
                                             - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                 43564: CLOUD-939: <Record Only>
                                      43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                         - Original jar did not get removed in previous commit
                                         << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                            43823: Fix merge error
                            43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43579: Public api test, fix intermittent test failures (hopefully)
                                 43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                 43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                            43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                            43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                 43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                 43762: Fix the build
                            43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                           39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                              - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that
                                                much slower even for western encodings
                                                - It still does csv and xml to pdf
                                                - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf)
                                                  The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used.
                                                - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason.
                                                - transformer.complex.Text.Image now has a wild card first transformer for the same reason.
                                              - Allow transformer config element supportedTransformations to wild card source or target mimetype
                                      39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                           39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                              - Fix build failures (not sure about RecordsManagementAuditServiceImplTest)
                                              - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox
                                      40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                           40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                              - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                           40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                              - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                including fixes that existed on only one or the other.
                                              - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                 43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                            43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43762: Fix the build
                            43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      40859: public api:
                                      40862: CLOUD-555: "Updating comment fails because node not found"
                                      40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                      40979: Added tests for non-numeric params and non-european characters
                                      41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                           41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                      41097: Added quickshare and cloudsync to cmis filter list
                                      41098: Renamed serializer/deserializer lists for RestJsonModule
                                      41099: Cleaned up consistent Rest responses - CLOUD-574
                                      41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                      41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                      41105: Added key for trusted layer7 relationship
                                      41137: Public api:
                                      41146: Fix trusted authentication against OpenCMIS
                                      41168: Public apI;
                                      41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                      41170: public api:
                                      41171: public api:
                                      41172: public api:
                                      41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                      41186: Fix solrcore properties
                                      41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                      41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                      41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                      41325: Public api:
                                      41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                      41369: Public api:
                                      41422: Sample OAuth call for the Resource Owner Password flow
                                      41427: Sample OAuth call for the Client Credentials flow
                                      41433: Public api: (1) parameterize site members/people sorting in service api
                                      41434: Public api: minor comment service fix
                                      41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41439: Public api: fix for default tenant id in CMIS requests
                                      41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                      41457: Fix build
                                      41461: Public api: more tests
                                      41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                      41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                      41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                      41628: Public api: more tests
                                      41672: CLOUD-672: "404 Error when browsing child files/folder "
                                      41673: Public api: more tests
                                      41675: CLOUD-674: "Root network calls need to return application/json content type"
                                      41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41823: Public api: more tests
                                      41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                      41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                      41867: CLOUD-711: "It should be possible to remove a favourite site"
                                      41957: Public api: - error handling improvements - more tests
                                      41970: Public api: - fix build  (add missing files)
                                      41972: Public api: - more tests (including OpenCMIS TCK)
                                      42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                      42058: Public api: changed logging package name
                                      42124: Public api: - more tests - minor fixes
                                      42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                      42126: Public api: fix up OpenCMIS tests
                                      42171: Consistency fix for CLOUD-695.
                                      42180: Fix build
                                      42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                      42214: Public api tests (cmis)
                                      42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                      42253: Fix build
                                 42735: (RECORD ONLY) Fix build (fix merge error)
                            43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                 43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                 43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                            43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                            43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                            43881: Revert CLOUD-942: Reverse merge r43830 
                            43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                            43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                            43924: Disable intermittent OpenCMIS tests
                            43925: Disable intermittent test
                            43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                            43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                       44203: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                             44200: Probable fix for     ALF-16895 SOLR: Cannot find files after restart and reindex solr 
                       44272: Resolve CLOUD-930: Registration with uppercase domain name / (email address) fails to activate user
                       44276: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                             44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
                                    - fix initial cache state to cope with duplicate leaf/aux doc entries.
                       44314: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                               44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
                                      - fix incremental cache state to cope with duplicate leaf/aux doc entries.
                       44373: Follow-up on big merge r44059 for Maven build
                            - Upgrade POI to 3.9-beta1-20121109-alfresco-patched
                            - Upgrade JODConverter to 2.1.0-patched
                            - Added Chemistry client as a dependency in Solr tests
                       44571: Merged BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN to BRANCHES/DEV/CLOUD1:
                            44527: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 38425: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33822: Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:
                                           33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS
                                           33821: ALF-12212 - SPP/Vti requires that all links include a protocol and are valid, while share does not. When building the Vti response, prefix URLs with http:// if they lack a protocol at the start, and ignore any that are malformed
                                 38431: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33893: SharePoint refactoring - first part of removing the old Alfresco v2 code
                                 38432: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33905: SharePoint Refactoring - Move to only a single class for the VersionServiceHandler
                                 38433: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33906: SharePoint Refactoring - Move to only a single class for the User and Groups Handler
                                 38434: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33907: SharePoint refactoring - fix deprecation warnings by switching to the new way of finding people, when searching for a user with a given email address
                                 38435: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33923: SharePoint refactoring - Start on merging the old style and new style List support, mark the old style as deprecated, and add TODOs where needed for future changes
                                 38440: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      35486: ALF-13028: Sharepoint broken by changes to WebDAV
                                 38442: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      35530: ALF-13028, ALF-13696: broken sharepoint module
                                 38443: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      36148: Merged BRANCHES/DEV/BELARUS/HEAD-2012_04_25 to HEAD:
                                           35710: ALF-13028 : Sharepoint broken by changes to WebDAV
                                 38444: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37648: Sharepoint: fixed typo in class name VtiDocumentHepler
                                 38447: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37929: First try at incremental-spp-tomcat-exploded target
                                 38451: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37943: Sharepoint: fix build for compile-spp dependency and for new incremental-spp-tomcat-exploded target.
                                 38453: Sharepoint: remove error causing property injection - probably came from a double-merge.
                                 38472: Sharepoint: fix missing singletonCache property for VtiPathHelper bean, probably lost in merges.
                                 38477: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37926: Correct handling of GetMeetingsInfo - lcid may not always be set
                                 38478: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37927: More parameters that are optional
                                 38481: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37928: More parameters that are optional
                                 38483: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37931: A site may not have a calendar container yet
                                 38485: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37933: Set the response type to text/xml as required
                                 38486: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37938: Stub out support for UpdateMeeting and SetWorkspaceTitle
                                 38487: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37939: Fix title vs name confusion in meeting sites, support setWorkspaceTitle, and correct the error reporting on create site
                                 38488: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37940: SPP Vti SOAP error codes must be zero padded to 8 characters
                                 38489: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37941: Improve error handling in create/set title/delete, and match the required error codes
                                 38491: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38005: Correct logic to fix test
                                 38493: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38006: DTEND is optional in iCal, if not set it means the meeting ends at the start time
                                 38494: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38007: Pull out commong workspace related code to a parent endpoint class
                                 38496: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38009: Sharepoint [MS-VERSS]: GetVersions should state whether file has versioning enabled.
                                 38498: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38011: More refactoring to use the new commong workspace parent endpoint
                                 38501: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38012: Start to clean up how exceptions are done in the meeting handler layer
                                      38013: Start to refactor the common parts of meetings to a parent abstract class, and stub out the SetAttendeeResponse endpoint
                                      38014: Fix import warnings
                                      38015: More towards Add/Update/Restore meeting
                                      38016: Common building of the MeetingBean
                                      38017: Improve error reporting on add/update meeting, to match the spec requirements
                                      38018: Sharepoint [MS-DWSS]: CanCreateDwsUrl returns GUID if requested name is empty string.
                                      38019: ALF-14687 - ISO8601 dates from non-Alfresco sources may have more than 3 millisecond digits
                                      38020: Stub out the SetAttendeeResponse endpoint, but the handler does nothing with the details
                                      38021: More meeting exception improvements
                                 38503: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38077: Refactor the Meeting related endpoints to use common superclasses, and fix some common problems / exception handling in the process
                                      38078: Further error handling checks
                                 38504: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38080: Match the rather strange behaviour of getMeetingsWorkspaces and the recurring flag, as set down in the spec
                                 38505: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38088: Sharepoint [MS-DWSS]: partial fix to XML fault message generation.
                                      38089: Sharepoint [MS-DWSS]: fuerther partial fix to error message generation for CreateDws.
                                 38506: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38091: Sharepoint [MS-DWSS]: S1_TC08: returning error with AlreadyExists but should be ServerFailure.
                                 38507: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38093: Support filtering by boolean properties, as well as String ones, in GetChildrenCannedQuery
                                      38094: Support for listing calendar entries by their outlook status (isOutlook / OutlookUID), via a Canned Query
                                      38095: De-Lucene the SharePoint / Vti Meeting Service handler, using the new CalendarService list method
                                      38096: Sharepoint [MS-DWSS]: S1_TC09 and others, hyphens in GUID were being translated to underscores.
                                      38097: Vti/SPP support for restoring a deleted meeting (assuming it is still available in the archive store)
                                 38508: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38099: Make the error message a bit more helpful, in the case that the assoc qname is too long
                                      38100: Check for errors from the create site share call
                                      38101: Validate that the site Short Name isn't too long during creation, and throw a helpful exception if it is. (Site Short Names get used in Authority Names, which are limited by the DB model to 100 characters)
                                      38102: Update the site name max length check - need to account for the role group names too
                                      38103: There is a maximum size of a site short name, based on the limits of the authority names in the permissions service, so truncate the Vti/SPP site name before creation to fit within that
                                      38104: Specific error response needed for GetMeetingsInformation on a subsite
                                 38509: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38134: Sharepoint [MS-VERSS]: S1_TC05 removed manual entity encoding of quotes, as dom4j was then escaping the ampersands.
                                 38510: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38139: Sharepoint [MS-DWSS]: fixed error message generation for CreateFolder.
                                      38140: Sharepoint [MS-DWSS]: Result element should be standalone XML.
                                      38141: Start removing deprecated, old style lists in favour of the full list support
                                 38511: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38143: Improve handling of abstract lists, and convert more classes to use that method
                                      38144: More convertions to AbstractListEndpoint, and improve logging by centralising it better
                                 38512: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38146: Prepare to do more of the List details not via hard coded FTL
                                      38147: Convert to only having the fields hard coded in the ftl, and the rest dynamically generated
                                      38148: Remove deprecated old style ListBean (now all replaced with ListInfoBean), and tidy up around the removal
                                 38514: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38156: Start on processing the request for UpdateListItems, and support GetList by UID as well as Name
                                      38157: Sharepoint [MS-WEBSS]: fixed GetWeb to respond with the "context site" if "." or "" requested in SOAP body.
                                 38515: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38229: Improve the list definition model, and add more support for UpdateListItems
                                 38516: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38231: Refactor the current (rather hard coded) GetListItems support into an abstract class, and then use that to stub out the other two GetListItems* endpoints
                                      38232: Sharepoint [MS-WDVMODUU]: implemented WebDAV PUT method.
                                      38233: Stub out Change Since support
                                 38517: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38237: Improve error handling, and reduce some duplication
                                      38238: More details needed
                                      38239: Use the same rendering of a list details
                                 38518: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38381: ALF-14835: Sharepoint/WebDAV: exclusive lock fails deemed to be owned by someone else.
                                      38382: Sharepoint [MS-WDVMODUU]: activity posting disabled upon DELETE.
                                 38785: Merged alfresco/HEAD to alfresco/BRANCHES/DEV/CLOUD1_SP:
                                      38752: WebDAV/Sharepoint: extracted WebDAVHelper to spring configuration.
                            44543: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 38996: WebDAV: added getUrlPathPrefix tests for WebDAVHelper.
                                 38997: WebDAV: added setter for urlPathPrefix property (to aid in spring config), ensures path prefix terminated in slash.
                                 39001: WebDAV: getURLForPath(...) appends trailing slash to path prefix if missing.
                                 39002: WebDAV: removed redundant createDAVHelper() method.
                                 39016: WebDAV: added getRepositoryPath(request) method (replaces WebDAV's static method)
                                 39017: WebDAV: replaced use of static WebDAV.getRepositoryPath(req) with non-static version in WebDAVHelper.
                                 39019: Cloud/SPP: thor module must have dependency on SPP module.
                                 39020: Cloud WebDAV: CloudWebDAVServlet no longer uses static getRepositoryPath(req) method.
                                 39021: Cloud WebDAV: override getRepositoryPath(req) with version that gets path within tenant.
                                 39023: SPP core: added hook to VtiWebDavAction to allow overriding of execution behaviour.
                                 39025: SPP: minor logging improvement.
                                 39026: SPP: define SPP version of WebDAV helper and inject into VtiWebDavAction instances.
                                 39060: Cloud SPP: introduced cloud/spp webdav helper.
                                 39061: Cloud SPP: missing part of commit, moved methods out of CloudWebDAVHelper and into SPPCloudWebDAVHelper.
                                 39095: Cloud WebDAV: move doclib URL munging out of core WebDAV.
                                 39182: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39167: WebDAV: remove static replace(str, repl, with) method.
                                 39185: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39172: WebDAV: removed static WebDAV.getRepositoryPath() method. Only use the non-static version.
                                 39186: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39173: WebDAV: fix broken code from moving inlining of getRepositoryPath(...) from WebDAV to WebDAVHelper.
                                 39187: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39174: WebDAV: removed redundant DIR_SEPARATOR constant.
                                 39189: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39178: WebDAV/SPP: remove static WebDAV.getURLForPath(...) methods.
                                 39323: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39203: WebDAV: fix broken UnlockMethodTest.
                                 39324: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39204: WebDAV: fix broken WebDAVMethodTest.
                                 39325: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39309: Sharepoint: no longer uses sysAdminParams to determine incoming URL path prefix.
                                 39330: Sharepoint: fix code broken by merge -c 39325 (from HEAD).
                                 39346: Cloud/sharepoint: fix for merge from HEAD, -c 39309 (remove sysAdminParams as supplier of URL path prefix)
                                 39365: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39364: Sharepoint: making PROPFIND more tolerant of null values in a node's properties.
                                 39474: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39473: WebDAV: introduce getChildren() method for helper.
                            44544: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 39541: Sharepoint: added test for decomposeDocumentURL functionality.
                                 39552: Sharepoint: added doDecomposeURLWork test for incorrect URI path prefix.
                                 39570: Sharepoint: refactoring for cloud overrides and testing improvements.
                                 39674: SPP core: use VtiPathHelper.getPathForURL() instead of using request directly.
                                 39676: SPP core: refactored action execution to provide hook for subclasses.
                                 39695: SPP: null GUID no longer results in an empty rid{}
                                 39696: SPP core: VtiWebDavAction - setting the method's details is delegated to the DAV executor.
                                 39698: SPP core: added hook for detecting whether a URI path does not specify a site.
                                 39701: SPP core: abstract parent for vtiRequestDispatcher makes it possible to override bean and inherit configuration.
                                 39702: SPP core: move support methods from test class into abstract base class.
                                 39705: SPP cloud: added cloud specific filter and path helpers.
                                 39707: SPP cloud: remove redundant code from CloudwebDavExecutorImpl
                                 39708: SPP cloud: introduce request handling logic in common for WebDAV and SPP.
                                 39709: Cloud SPP/webdav: WebDAV uses common request handling class.
                                 39710: SPP cloud: SPPCloudWebDAVHelper was incorrectly stripping off tenant domain for getRepositoryPath().
                                 39712: SPP cloud: introduce a cloud-specific VtiRequestDispatcher.
                                 39723: SPP core: servlet filter now registered for forwards as well as fresh requests.
                                 39724: SPP core: removed URL decoding of URL in XML response generation.
                                 39759: SPP core: use separate servlet mappings for /alfresco/* and /*
                                 39865: Cloud SPP: cleaned up runAsTenant usage.
                                 39868: SPP cloud: missing files from previous commit ("cleaned up runAsTenant usage")
                                 39916: CLOUD-28: cloud SPP raises activity posts for PUT, DELETE.
                                 39930: Cloud SPP: tenant domain is extract from RPC method request with "url" parameter, instead of through request URL path.
                                 39941: Cloud SPP: reintroduced separate instances of CommonRequestHandling that was lost by moving instantiation into spring.
                                 39971: CLOUD-137: 4.4 Add Mixpanel Analytics events to SharePoint Protocol
                                 39972: CLOUD-137: 4.4 Added an "spp" event source.
                            44545: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 40006: Bamboo/CI: added dependency on spp module when building cloud.
                                 40007: WebDAV - cloud only: added missing WebDAVHelper constructor argument to spring definition.
                                 40015: Cloud SPP: bake SPP module into WAR file at build time.
                                 40027: Cloud SPP: Committing binaries that can be used by ops for testing/prototyping.
                                 40365: WebDAV/SPP: moved webDAVLockService bean definition into webdav-context.xml
                                 40366: WebDAV/SPP: moved webDAVLockService to remote-api-context.xml
                                 40368: SPP: removed circular task dependency.
                                 40373: Cloud SPP: added incremental-spp-tomcat-exploded as dependency of incremental-cloud-repo-exploded
                                 40376: Test to see if this fixes build failures, by adding SPP classes/config to unit testing classpath.
                                 40380: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38861: WebDAV: fixed dependency problem; fixes test RepositoryStartStopTest.
                                 40384: Cloud SPP: ensure jetty libs on classpath during test.
                                 40392: Cloud SPP: remote-api-context.xml must be loaded before cloud and SPP modules.
                                 40400: Cloud SPP: fix classpath to use fileset instead of pathelement.
                                 40444: SPP build problems: attempt to ensure thor config comes after SPP config in unit testing classpath
                                 40447: Cloud SPP: ensure SPP module is loaded prior to cloud module.
                                 40450: SPP Cloud: backing out change 40444 (CI build changes)
                                 40451: SPP Cloud: another attempt to straighten out testing classpath problems.
                                 40456: Temporarily disabling explicit SPP module import.
                                 40483: Cloud SPP: fixed broken test and clarified behaviour in comments.
                                 40519: Cloud SPP: remove exclusion of module.properties when copying resources during deploy-spp-tomcat-exploded ant target.
                                 40523: CLOUD-25: 3.1 The protocol must be secured using the user's standard Cloud credentials
                            44546: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 40551: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      38401: Fix activities feed mail notifications.
                                      38614: Resolve CLOUD-157: Cloud1 does not deploy due to addDutchEmailTemplates patch failing
                                      38676: Exclude irrelevant tests even if minimal.testing? flag is not set
                                      38726: Resolve CLOUD-160: "Data too long for column 'report' at row 1" when deploying Cloud1-144 to Test
                                      38734: Fix CLOUD1 build to ensure test results from previous builds are cleaned
                                      38754: Fix test
                                      38765: Merged BRANCHES/V4.0 to BRANCHES/DEV/CLOUD1:
                                           37766: Fix for ALF-14529 Share Solr admin console page shows "Unavailable: 05120041...
                                           37800: ALF-14145 Flash preview quality is poor
                                                - Reverting change r30483 V3.4-BUG-FIX Sept 13 2011 for ALF-9417
                                                      swf.encoder.params=-s zoom=72 -s ppmsubpixels=1 -s poly2bitmap=1 -s bitmapfonts=1
                                                  being changed back to:
                                                      swf.encoder.params=-s poly2bitmap,subpixels=72
                                                  The original 001-Cover_Cover.pdf file from ALF-9417 does now preview in 4.0.2
                                      39058: CLOUD-190: Ensure that sub-folders of folders named "res" and "proxy" can accessed.
                                      39206: Fixed CLOUD-198 "WASA - XSS issue with quickshare"
                                      39210: Cloud1 build fix
                                      39236: Fixed and baked in Share Hazelcast Cloud specific configuration into thor-share module. Now only need to override hz:hazelcast bean with AWS key specifics for test/production.
                                      39314: Resolve CLOUD-203: WebDAV incorrectly handles file / directory names with spaces in them
                                      39341: Resolve CLOUD-181: Webdav Cluster Failiure in Cloud1 build 148 startup error: java.lang.ArrayIndexOutOfBoundsException: 72
                                      39357: CLOUD-164: Remove categories from document library
                                      39358: Resolve CLOUD-186 500 error displayed when trying to add 'Content I'm editing' dashlet
                                      39388: Resolve CLOUD-185: My / Site Activities displayed incorrectly
                                      39391: Resolve CLOUD-161 Patching is taking too long - specifically patch.fixBpmPackages
                                      39499: Resolve CLOUD-395 TEST server startup log - upgrading to cloud1
                                      39500: Resolve CLOUD-187 java.lang.IllegalArgumentException: Must provide existing lockToken
                                      39554: BDE-90: Setup build for deployment of Cloud artifacts to Maven repository
                                      39559: Merged THOR1 to CLOUD1
                                           38529: CLOUD-399 / ALF-14887: User sign-up issue
                                              - Workflow prior to mobile registration did not have the isPreRegistered property. Changed it so that if the property does not exist, it defaults to false.
                                              - Logged warning with email address in log for easier location of error.
                                           39553: CLOUD-400 / ALF-15149: Prevent an infinite loop in AlfrescoSolrEventListener.RemoveNullEntriesCacheMatch.updateCache()
                                      39563: Merge BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to DEV/CLOUD1 (r38673-39562)
                                      39567: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39566: Allow the sync mode to be fetched by guest (it need not be hidden), then fetch from Share as guest, to avoid problems when fetching the sync mode if the current user's credentials have expired (otherwise it breaks the redirect back to the login)
                                      39568: Fix YUI options to match the version in use (-p is no longer supported)
                                      39569: Cloud is always build on top of enterprise, so remove the duplicated projects.xml taken from enterprise and use the enterprise projects.xml instead. (Fixes warnings during build)
                                      39575: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39574: Cloud lacks a guest mode, so switch to unauthenticated for the sync mode fetch (user credentials may not be available)
                                      39579: Undoing some CloudSync-specific restrictions on what test cases are run.
                                      39584: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39580: CloudSync: fix Unsync - to ensure we don't leave sync aspects (such as failed, which reappears if src file is re-synced)
                                      39586: Merged V4.1 to CLOUD1 (might fix the build)
                                           39207: ALF-15015 follow-up: make sure the first enterprise test that runs has no specific license, since we just reset the database
                                      39588: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39587: ALF-15222: Cloud Folder picker: Newly created folder isn't selected
                                      39596: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39589: ALF-15098: Folder Picker causes JS error in the document details page
                                           39561: Mark from Thor1 to V4.1 to Cloud1
                                      39602: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39076: ALF-15013 ALF-15015: Reset database before running enterprise tests, otherwise SecurityTestSuite leaves it in a bad state
                                      39608: Removed incorrect com.sun import
                                      39610: Merged HEAD to BRANCHES/DEV/CLOUD1
                                           38834: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
                                              38607: Fix for ALF-14934 - Components YUI menus hit area is small. iPad specific CSS fix.
                                              38631: ALF-14820 - Document Library - Upload actions and File Browse buttons (doclib, user profile image, upload vers   ion etc) - not appropriate for iOS.
                                              38632: ALF-14934 - increased hit area for filter and tree/category nodes for ios.
                                              38667: Repository toolbar changes for ALF-14820
                                              38668: Patched YUI menus to support additional touch events (touchend specifically) and as custom menu events to fix   ALF-14809.
                                              38738: Correct fix for ALF-13650:
                                                     Double byte code white spaces in front and at the end of a file name should be removed as the same behavior of    Single byte code white space. Altered Alfresco.util.trim() in order to support double byte code white spaces.
                                                      - did not handle null/defined which are returned when creating content in Wiki, Blog and Discussions.
                                              38745: ALF-14807 - Fixes related to long file name display margins for iPad on Document Details page.
                                              38790: ALF-14927: Ensure that RSS feed URLs are maintained in RSS dashlet when the URL contains request parameters
                                              38792: ALF-13297 - removed install WebScript webscripts (updated Surf libs - r1094)
                                              38831: Fix for ALF-14992 - Share: display list of rules for a folder: unterminated string literal
                                                     - actually a wider spread issue of failing to handle multiple line field values (e.g. "description" fields) wh   en rendering json into a component page or template
                                           39067: Fixed drag n drop issues for m.share on ipad
                                                  - Added ootb support for touch events to drag n drop classes in yui-patch.js
                                                  - ALF-14816 Dashboard - Cannot customize dashboard layout
                                                  - ALF-14817 Customize Site - Can't add or change the order of page components
                                                  - ALF-14822 Rules - Cannot reorder rules when multiple rules are defined on a folder
                                                  - This also means all "dividers" on the documentlibrary, discussions etc pages now work
                                      39614: Reinstate repository tests (so far, only RepositoryStartupTest is run)
                                      39615: BDE-90: do not try to deploy to Maven repo artifacts which are not built
                                      39642: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39597: CloudSync: tweak a couple of unit tests
                                           39598: CloudSync: ALF-14655 - update simple file sync (to test multiple sync'd files)
                                           39606: CloudSync: minor log level adjustments
                                           39607: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be pushed in parallel
                                           39613: Refactor of test code. SyncTrackerComponentTest now uses JUnit Rules to manage temporary content and to undo mocking out of services.
                                           39616: CloudSync: CloudSync: ALF-14483 - SyncTracker - multiple syncs (to different tgt folders) with multiple files
                                           39633: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be processed in parallel
                                           39639: ALF-15238: Bitrock Installer: Readme.txt should be updated - Alfresco version is 4.0
                                           39640: ALF-15231 Restore, with refactorings / making more general, the ability to lazy create the remote credentials container if bootstrap has not created it (eg on Cloud)
                                           39641: ALF-15230 Refactor the lazy container creation code, to use the new SystemNodeUtils helper
                                      39644: ALF-15230/ALF-15231 Disable two patches on cloud, which create new system containers, as the number of tenants means this is a large amount of work. Services will not lazy create if needed, but for on-premise we retain the up-front creation to avoid surprises and allow predictable permissions in advance if required
                                      39645: Disabling one test on CLOUD1, pending discussion with Mark, Jan.
                                      39661: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                                           39660: Fix for ALF-14244 - Sort options are not appropriate for some pre-canned Document Library queries and need disabling in the UI as they can confuse the user. Implemented by Valery Shikunets.
                                      39666: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           39665: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39664: CloudSync: ALF-14483 - SyncTracker unit tests - simple file sync test
                                      39675: Resolve CLOUD-410: Disable multi-threaded SOLR
                                      39680: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39643: ALF-15220: Indirect sync and sync failed indicators appeared together on nodes during the demo
                                           39653: ALF-15041: Cloud Sync doesn't work with IE7
                                           39670: Rework to cloud key license stuff - introduces a ValidLicenseEvent
                                           39673: New unit test for adding checked out nodes into a sync set.
                                           39677: ALF-14903 Move the Sync allowed/not-allowed check, based on Network/Tenant, to AbstractCloudSyncAbstractWebScript, and have this used by the webscripts based on this too. Then, allow UnSync to proceed no matter what the tenant status, and add unit tests
                                      39699: ALF-14454: get rid of hrtlib.jar
                                      39700: BDE-90: deploy cloud-specific artifacts
                                      39731: CLOUD-421: Merged PATCHES/V4.0.2 to CLOUD1
                                           39725: ALF-15176: Multi-threaded SOLR tracking suddenly stops leaving transactions unindexed
                                              - Debugged on environment provided by Antonio
                                              - If the last incomplete batch in a chunk consists entirely of empty transactions (or transactions consisting entirely of nodes updated in later transactions) it would loop forever
                                      39738: CloudSync: add default (info) Sync log level
                                      39744: Merged HEAD to BRANCHES/DEV/CLOUD1 (for BDE-73):
                                           39282: Get context from classpath rather than file system
                                           39409: fetch application context from classpath rather than file system
                                           39433: tune AVM tests to make them resilient to a change of working folder
                                           39743: Allow to override the location of test resources using a system property
                                      39745: BDE-73: Add experimental pom.xml files
                                      39755: BDE-73: Add experimental pom.xml files
                                      39830: Resolve CLOUD-423: Concurrent registration / account activations are not handled gracefully
                                      39855: BDE-73 Configure Sonar properly + filter a few failing tests
                                      39877: CLOUD-438: Merged V3.4-BUG-FIX to CLOUD1
                                           36446: Fix for ALF-13404 - Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                                            - Effectively removed all PATH based queries using the pattern /companyhome/sites/*/container//* as they are a non-optimized case
                                            - Replaced the "all sites" doclist query using the above pattern with /companyhome/sites//* plus post query resultset processing based on documentLibrary container matching regex
                                            - Optimized favorite document query to remove need for a PATH
                                            - Optimized Content I'm Editing discussion PATH query to use /*/* instead of /*//*
                                            - Fixed issue where Content I'm Editing discussion results would not always show the root topics that a user has edited
                                            - Added some addition doclist.get.js query scriptlogger debugging output
                                           36449: ALF-13404 - Fix for issue where favoriates for all sites would be shown in each site document library in the My Favorites filter.
                                           37190: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
                                              37189: ALF-13404: Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                                                 - Additional query improvement by Pavel
                                           37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23
                                      39878: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                                           39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
                                      39919: Added additional configurable datasource that is used by activiti IdGenerator to fetch new block of ID's. Can be defined using JNDI-lookup, reverts to default datasource based on well-know alfresco-properties.
                                      39925: CLOUD-422: Reverted revision 39919, will be re-comitted after CLOUD1 released
                                      39954: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           39655: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39490: Changing the icon for creating a new folder in the cloud
                                                39580: CloudSync: fix Unsync - to ensure we don't leave sync aspects (such as failed, which reappears if src file is re-synced)
                                                39587: ALF-15222: Cloud Folder picker: Newly created folder isn't selected
                                                39589: ALF-15098: Folder Picker causes JS error in the document details page
                                                39597: CloudSync: tweak a couple of unit tests
                                                39598: CloudSync: ALF-14655 - update simple file sync (to test multiple sync'd files)
                                                39606: CloudSync: minor log level adjustments
                                                39607: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be pushed in parallel
                                                39613: Refactor of test code. SyncTrackerComponentTest now uses JUnit Rules to manage temporary content and to undo mocking out of services.
                                                39616: CloudSync: CloudSync: ALF-14483 - SyncTracker - multiple syncs (to different tgt folders) with multiple files
                                                39633: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be processed in parallel
                                      39955: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           39656: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39640: ALF-15231 Restore, with refactorings / making more general, the ability to lazy create the remote credentials container if bootstrap has not created it (eg on Cloud)
                                                39641: ALF-15230 Refactor the lazy container creation code, to use the new SystemNodeUtils helper
                                                39643: ALF-15220: Indirect sync and sync failed indicators appeared together on nodes during the demo
                                                39653: ALF-15041: Cloud Sync doesn't work with IE7
                                      39956: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           39736: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39735: CloudSync: ALF-14483 - multi-threaded SyncTracker
                                           39866: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39670: Rework to cloud key license stuff - introduces a ValidLicenseEvent
                                                39673: New unit test for adding checked out nodes into a sync set.
                                                39677: ALF-14903 Move the Sync allowed/not-allowed check, based on Network/Tenant, to AbstractCloudSyncAbstractWebScript, and have this used by the webscripts based on this too. Then, allow UnSync to proceed no matter what the tenant status, and add unit tests
                                                39683: ALF-15162 - Unclear error message when delta syncing and the target is gone
                                                39686: Replaced GPL license with enterprise licence.
                                                39687: Enterprise license for enterprise remote api project
                                           39867: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39747: ALF-14377	Need to decide what to do when SSD creator user is no longer valid 
                                                     - part 1 nodes are marked.
                                                39748: CloudSync: fix compile error
                                                39767: CloudSync: fix ALF-15145 - Unsync of a folder (sync) that has a working copy file causes indirect icon to remain ...
                                                39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
                                                39810: ALF-15221: Cloud Sync Status: Failure message when getting location is misleading
                                                39812: UI Bug Fixes:
                                                     - ALF-15174: Uses already copied slingshot.properties file for message strings needed in both repo and Share
                                                     - Cloud delete file message shouldn't refer to the cloud
                                                39820: ALF-15267: Edit online is available for locked on-premise copy 
                                                39826: ALF-14377 - Need to decide what to do when SSD creator user is no longer valid
                                           39870: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39847: ALF-15185: YUI Overlay Mozilla Scrollbar fix should be prevented in recent versions of Firefox too.
                                                39859: ALF-15249 Add a new method hasSyncSetDefintions, with unit test, and use this to skip the Sync Pull step on-premise if no SSDs have been defined on the local system
                                                39860: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes.
                                           39914: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39863: ALF-15268: Cancel button disabled in the target selection window for new folder creation in Cloud
                                                39864: ALF-15003 Sync failed for the file (where write access on source removed for sync owner) but no matter this file appears in Cloud
                                                39876: ALF-15301: IE8 specific: It is impossible creating a new folder in a cloud target selection window/Cloud location
                                                39883: CloudSync: fix ALF-15270 - moving directly synced node (on source) causes target node to be deleted
                                                39902: ALF-15041: Cloud Sync doesn't work with IE7
                                                39903: ALF-15041: Cloud Sync doesn't work with IE7
                                                39904: ALF-15041: Cloud Sync doesn't work with IE7
                                           39920: Bug fixing for CSS issues
                                      39959: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           39951: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39915: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes
                                                39924: CSS fixes for the sync panel
                                                39942: ALF-14911 - Path shown in the version comments does not match the path shown in the sync status dialogue
                                                     - first part share paths are now handled separatly
                                                39943: CloudSync: fix remainder of ALF-15130 - sync time for initial sync of working copy (+ unit test)
                                           39952: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                38871: (RECORD ONLY) Adds edition check before calling enterprise only webscript. Sets sync to OFF for non enterprise editions.
                                                38956: (RECORD ONLY) Chinese Translation for 4.1
                                                39011: (RECORD ONLY) ALF-14225: Refactor Welcome Dashlet to show 4 columns, the 4th one of which is always the cloud sign up text.
                                                39024: (RECORD ONLY) ALF-14225: Adds tracking to URL.
                                           39958: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39957: CloudSync: minor - some info logging (applies to src + tgt)
                                      39967: CLOUD-165: Merged 4.1-BUG-FIX to CLOUD1
                                           39962: ALF-15158: Downloading Office 97 files with .doc extension result in file with .dot extension when using Google Chrome
                                             - Added more complete and intelligent content disposition header with the aim of supporting  RFC 5987
                                      39977: CLOUD-454 - merge asynchronous dashlet improvements and remove inappropriate sections.
                                      40048: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                                           40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval (CLOUD-467)
                                           40047: Fix from Mike Hatfield for ALF-15372 - Chrome is blocking google map display for geo tagged pictures (CLOUD-468)
                                      40078: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           note: "blending" cloud sync fixes into CLOUD1 (as requested by BR)
                                           39997: ALF-14377: Need to decide what to do when SSD creator user is no longer valid
                                           40013: "Cloud Sync" link should not be shown in "My Profile" in the Cloud
                                           40056: Merged the sync specific changes to the other presentation.css files
                                           40070: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: (record-only: NB - already manually merged)
                                                 39566: Allow the sync mode to be fetched by guest (it need not be hidden) ...
                                                 39574: Cloud lacks a guest mode, so switch to unauthenticated for the sync mode fetch (user credentials may not be available)
                                           40071: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39996: ALF-14377: Need to decide what to do when SSD creator user is no longer valid
                                                40010: Enhancement to TemporaryNodes JUnit @Rule so that it gracefully handles checked-out nodes during test code.
                                                40017: During work for ALF-15296, I've fixed up the error handling during sync set creation.
                                                40019: Having fixed the TemporaryNodes @Rule in rev 40010 so that it handles checked-out test files gracefully, I'm removing Jan's workaround for a checked-out test file.
                                                40036: Addressing the important question raised in ALF-14950.
                                                40054: CloudSync: add simple *folder* sync unit test !
                                                40065: Removal of potential NullPointerException (not observed).
                                                40067: CloudSync: ALF-15287 - folder sync to a clashing name hierarchy causes file to be indirectly synced to the wrong place
                                                40068: Java doc corrections.
                                                40069: ALF-15364: CloudSync: folder sync with lock on-premise - pulled new file is not auto-locked
                                      40104: Fix for CLOUD-476 - userStatusRelativeTime is still referenced in org/alfresco/components/dashlets/my-profile.get.js and causes exception on user profile page when user status has been set.
                                      40147: French: Cloud Translation update from Gloria (based on EN rev38372)
                                      40173: Merged V4.1-BUG-FIX to CLOUD1
                                           38178: ALF-14720: Get rid of big, unused class
                                      40174: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           40092: Changing the color of the "Synced Folder" link for each theme
                                           40094: Property translation problem fixed: If there is a replacement parameter (e.g. {0}) and an apostrophe in a property the apostrophe needs to be escaped by using a double apostrophe otherwise the property cannot be translated correctly.
                                           40172: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                40072: Error message string updates, based on feedback from Docs.
                                                40076: Fixes encoding error introduced in r40072.
                                                40169: CloudSync: fix ALF-15380 - source file is deleted (or unsync with delete) but an unpulled target update causes target to remain synced (and/or not deleted)
                                      40343: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           40333: Probable fix for ALF-15430. sys:hidden aspect needs to be handled consistently by Hybrid Sync.
                                      40363: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           40356: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                40176: CloudSync: add simple rename test (file + folder sync)
                                                40282: CloudSync: ALF-15468 - Can't create cloud sync connection from Enterprise 4.1 to Alfresco "in the cloud" !
                                                40328: CloudSync: minor - unit test updates (for simple move of directly synced nodes - file or folder)
                                                40333: Probable fix for ALF-15430. sys:hidden aspect needs to be handled consistently by Hybrid Sync.
                                                40334: Removing unused import - also want to trigger rebuild on this plan as I suspect it failed randomly.
                                                40349: CloudSync: fix move out (=> target delete) - add unit tests ( ALF-14655 / ALF-15011 )
                                      40402: Fix to CSS error in cloudsync merge - incorrectly overridden font-size in H3 dashlet contents (fix from Mr "I read CSS in my sleep" Hatfield).
                                      40421: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           40419: Fix for the MLText parts of ALF-15502.
                            44550: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 40565: CLOUD-23: core changes to allow overriding of "edit online" button's URL generation.
                                 40566: CLOUD-23: override "edit online" button's URL generation to work with cloud format SPP URLs.
                                 40628: Cloud SPP: stop SOAP/RPC requests being rejected when URL is outside of doclib.
                                 40653: CLOUD-26: 4.1 All protocol features outside browsing the document library should be disabled
                                 40667: CLOUD-26: core change to support both Thor and standard URL schemes.
                                 40668: CLOUD-26: fix Document Management sidebar before disabling unwanted features.
                                 40670: CLOUD-26: fixing "add new members..." to work with cloud (before disabling feature!)
                                 40677: Cloud SPP: fix disallowing of unsafe methods outside of doclib, fixed to allow all methods to Sharpoint protocol methods and fixed tests.
                                 40683: CLOUD-26: core changes to allow easy overriding of dwsServiceHandler bean without having to respecify configuration settings.
                                 40686: CLOUD-26: disable Members tab in Document Management sidebar of Office 2007.
                                 40693: CLOUD-26: disable Links tab of the Document Management sidebar in Office 2007.
                                 40814: Cloud SPP: users were unable to list/edit files within their non-home tenant.
                                 40846: CLOUD-28: made activity "appTool" parameter a configurable value.
                            44551: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 40861: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      40854: ALF-15557: Sharepoint subsystem to create activity records
                                 40863: Cloud SPP: Removed activity posting code made redundant by commit 40861
                                 41037: CLOUD-23: SPP can be deployed to the root context, i.e. "/"
                                 41079: CLOUD-26: core SPP changes to allow overriding of behaviour.
                                 41080: CLOUD-26: disable "documents" tab in document management sidebar of Office 2007.
                            44552: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 41102: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      40553: Remove on-premise style MT store Id extraction code from syncmode config lookup.
                                 41103: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      40783: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
                                 41106: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      40871: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           40342: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                                                35747: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                     34235: Upgraded Jackson to 1.9.4
                                                     34258: Removed invalid bean definitions (classes don't exist) for abstract="true" beans.
                                                     34463: Exported=true 
                                                     34464: Removed unused parent workflow
                                                     34465: Added a createComment method (Just cut and pasted Neils testcase code).
                                                     34466: Initial check-in of Rest Api code.  Still quite a bit to do.
                                                     34619: Added sources
                                                     34620: Going to start another Sprint so I need to check in everything up to date. WIP
                                                     34691: Renamed Action interfaces for better consistency, Fixed up POST methods with better Metadata about resources and fixed failing tests
                                                     34727: Reworked the Resource execution, added PUT webscript, improved the tests.
                                                     34853: Implemented HTTP Methods: GET, PUT, POST, DELETE with better test cases
                                                     34856: Initial cut of rest api implementations. Work in progress.
                                                     34935: Added EmbeddedEntityResource and uniqueid annotations. Recursively calls embedded entities, improved tests.
                                                     34956: Attempted simplification by removing the CollectionResource concept -> Just an EntityResource with 5 potential methods.
                                                     34986: 2nd cut of rest api implementations: still wip.
                                                     34987: Added a readById method for Resource GET using the relationship id
                                                     35007: Rest API (THOR-1150, THOR-1151, THOR-1152, THOR-1153, THOR-1220, ):
                                                         - explicitly set default timezone for date serialization/deserialization to UTC
                                                         - more rest api implementation tests
                                                         - rest api implementation re-factoring resulting from changes to the framework
                                                     35024: Automatically sets the id of passedIn object for a HTTP PUT for relationship resources.
                                                     35051: Further impl for public api: THOR-1150 -> THOR-1153 and THOR-1220
                                                     35059: Separated the GET executor so the embedded objects are called correctly.
                                                     35102: Added Paging, fixed up the Tests.
                                                     35117: wip, rest api implementations
                                                     35312: Made final
                                                     35313: Better exception handling with messages
                                                     35314: Improved paging/params and messages, started on embedded relations
                                                     35322: Added support for relations projections, to filter by properties use "properties" param, to add in relations use the "relations" param
                                                     35329: Handles null relationship keys
                                                     35377: Checks for simple property types which don't allow embedding
                                                     35496: WIP: rest implementations, test framework and tests
                                                     35529: Initial commit of scope and versioning support.
                                                     35539: Fixed the versioning for relationship resources
                                                     35560: Quick cleanup
                                                     35562: Embedded relationships is now working much better
                                                     35586: Safer serialization of Maps/Collections
                                                     35603: Added better version and filtering tests.
                                                     35611: Added Entity and Relationship not found exceptions
                                                     35612: Added Entity and Relationship not found exceptions
                                                     35674: Rest api implementations:
                                                          - node refs are represented solely by their uuid (workspace://SpacesStore is assumed)
                                                          - updates to model classes (hashcodes, equals, etc)
                                                          - more paging support
                                                          - tests
                                                35858: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                     35773: Added api versioning with @WebApiDeleted annotation.  Better inheritance handling and improved tests.
                                                     35774: Deleted, it wasn't supposed to be there.
                                                35988: WIP:
                                                    - sample requests
                                                    - more tests
                                                    - general fixes, including security fixes
                                                    - tag entity
                                                35990: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                     35938: Reworked filtering in a big way. Hopefully now it works.
                                                     35982: Clean up and bug fix the request
                                                     35983: Clean up and bug fix the request
                                                36002: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                     35992: Clean up after discussions with David/Steve. New Parameter called "parameters"! 
                                                36056: Clean up, not used
                                                36057: Changed the way responses are rendered, more consistent "entry" entries.
                                                36087: Changed the json structure for tests as well
                                                36134: Added paging parameter, cleaned up imports, more tests
                                                36146: WIP:
                                                     - fixed up create tag return type
                                                     - fixed up Person model entity so that it doesn't extend Node
                                                36151: Fix for Serialization of recursive related Collection of results
                                                36168: Better empty collection handling, initial sorting tests.
                                                36189: Fixes embedded resources by correct id.
                                                36210: WIP:
                                                     - updates to rest api request files
                                                     - changed Comment so that it doesn't extend Node. removed title
                                                     - more tests
                                                36211: WIP:
                                                     - service paging and other fixes and updates
                                                36298: Moved jetty files to fix the build (it's odd that cloud -r works and yet continuous.xml does not)
                                                36299: Update classpath as a result of jetty jars move
                                                36301: Fix to stop null values in hashmaps from being returned in results.
                                                36302: Added copyright notices
                                                36303: WIP:
                                                     - split site service into a base class (dealing with site permissions and membership) and a subclass (everything else) to aid the following
                                                     - moved site membership functionality into canned queries for person sites and site members relations
                                                     - changed totalItems to an Integer so that it can be null if total items is not known
                                                     - added siteId filtering for activities
                                                     - copyright notices
                                                     - creating a comment through the comment service raises a share-like activity
                                                36304: WIP:
                                                     - changed totalItems to an Integer so that it can be null if total items is not known
                                                     - copyright notices
                                                36309: Servlet API 2.5 needs to be included at the top for the embedded jetty to work - need to revisit this.
                                                36310: Temporary fix for dealing with nodeRefs embedded in activity summaries: regex match and convert to NodeRef.
                                                36312: Fix tests
                                                36325: Add jetty jars to ant test classpath
                                                36327: Site memberships fix, override search subsystem to force lucene, re-instate full site service implementation (Spring circular dependencies are ok)
                                                36335: Add missing file
                                                36367: Fixes to tests
                                                36368: CommentService fix - permissions.
                                                36438: WIP:
                                                    - Person filtering (for cloud)
                                                    - Disabled some tests that are preventing the test from running (will revisit)
                                                    - Person-avatar relation
                                                36522: WIP:
                                                    - fix sort ordering for site members
                                                    - fix site id filter for activity feed list (add tenant id)
                                                36523: WIP:
                                                    - more tests
                                                    - improved robustness of tests
                                                    - added status mappings for EntityNotFound and RelationResourceEntityNotFound
                                                    - for avatar, return base 64 encoded avatar data and avatar node id
                                                    - use more specific EntityNotFound and RelationResourceEntityNotFound exceptions.
                                                36646: Changes resulting from review
                                                     - make sure empty strings and null values are not output
                                                     - person entity tidy-up
                                                     - person visibility rules applied to person retrieval
                                                     - more tests
                                                     - return noderef of avatar node
                                                36668: Fix build, add missing file
                                                36694: Fix failing test
                                                36764: WIP:
                                                     - site containers canned query
                                                     - node ratings: return null average (rather than -1) if there are no ratings
                                                     - site membership canned query sorting - use an enum for sort fields
                                                36767: Add missing files
                                                36769: WIP:
                                                     - node ratings: remove user rating summary, added rating date and fixed up tests
                                                36770: WIP:
                                                     - some changes to property names for activity feed entries
                                                36823: WIP:
                                                    - re-instate -1 for average rating when there are no ratings
                                                36824: Changes resulting from review:
                                                    - merge activities into one relation
                                                    - quota model object to model network quotas
                                                    - Change HomeAccount -> HomeNetwork
                                                    - Changes to comment property names
                                                    - If average rating is -1 (from the rating service) convert to null
                                                    - remove readById from node entity resource
                                                    - Favourite sites url renaming
                                                36825: Removed debug logging for rest api
                                                36826: Commented out tag related tests until I figure out how to get the lucene search working
                                                36833: Added discoverablity for the documentation.  New @WebApiDescription, @WebApiParam annotations
                                                36871: Added tests for @WebApiDecrition, @WebApiParam
                                                37026: WIP:
                                                     - added discoverability annotations
                                                     - changes resulting from review:
                                                        o node ratings output restructure
                                                        o network quotas restructure (need to revisit this again)
                                                     - activity summary post processing framework
                                                     - added non-caching to rest api webscript (need to revisit)
                                                     - don't output empty strings (need to revisit)
                                                     - more tests
                                                37058: WIP:
                                                    - change tag service support
                                                37141: WIP:
                                                     - tag sorting
                                                     - fix JSON issue in PreferencesService
                                                37142: WIP:
                                                     - refactoring: split functional areas into separate REST API implementation classes
                                                     - added copyright notices
                                                     - network quotas represented as a list
                                                     - ensure empty (zero length) JSON strings coming into the REST api are treated as null
                                                37300: WIP:
                                                     - support for update comment
                                                     - activity summary processing
                                                     - web script set no caching and response content type
                                                37301: WIP:
                                                     - support for update comment
                                                37354: Build fix: try rebuilding indexes
                                                37369: Fix build: try again
                                                37498: More logging to determine build failure using lucene for search
                                                37608: Build fix?
                                                37609: Fix build
                                                37637: Fix build: try again
                                                37672: Build fix (try again)
                                                37860: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                                                37861: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                                                37862: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                37864: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                37866: Unit test fix
                                                37950: Build fix for ApiTest (another try - override repository-properties bean to force lucene)
                                                38051: Build/test fix (another try)
                                                38072: Removed file no longer required
                                                38114: Better representation of the Resource metadata.  Try calling: /alfresco/service/public/alfresco/versions/1
                                                38230: Fix PublicApiTest on the build machine
                                                38309: Public api test fixes
                                                38319: Public api webscript transaction configuration. Make get webscript r/o transaction.
                                                38320: Public rest api: make sure http response headers are written before the response content.
                                                38340: More build test fixes
                                                38349: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                    - fix up CMIS query fallout
                                                38530: Fix tests
                                                38531: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                     - fix up cmis queries
                                                38552: Further test fixes
                                                38574: Added some comments
                                                38730: Added OPTIONS webscript to get metadata on the current url
                                                38879: Refactored a little to make the code easier to extend / customise
                                                38880: Fixed incorrect config, I should try not to delete things.
                                                38986: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                                                     38954: Fix for ALF-14475: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                                                39010: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                                                     39006: Fix for ALF-14475 part 2: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                                                39090: Fixed broken webscript OPTIONS call
                                                39159: Fix broken INFO url mapping
                                                39326: Clean up, Added ResourceMetaDataWriter interface for different meta info presentation formats
                                                39331: The tests need their own context
                                                39609: Update to latest Chemistry libraries
                                                39657: Fix for CLOUD-417, part 1: "Delete a Comment"
                                                39741: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                39742: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                39750: Fix for CLOUD-417, part 2: "Delete a Comment"
                                                    - added delete comment method to comment service
                                                39754: Fix for CLOUD-417, part 3: "Delete a Comment"
                                                    - fixed up activity generation for update and delete comment
                                                39776: OpenCMIS TCK fix: getDescendants is using node service, which unlike the FileFolderService does not automatically remove hidden files.
                                                39780: Shifted public api opencmis webscript definitions to Thor
                                                39781: Shifted public api opencmis webscript definitions to Thor
                                                39782: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                39783: Minor fixes, comments
                                                39785: Public api tests
                                                    - move jetty libraries to 3rd party
                                                    - remove JettyComponent as a Spring bean and change how it's constructed
                                                39786: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                    - for unversioned documents, the revision number should not be appended
                                                39794: Added missing files for public api tests
                                                39795: Update to latest Chemistry libraries
                                                39834: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                    - for unversioned documents (or documents with version "1.0"), the revision number should not be appended
                                                39835: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                                                39836: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                39844: Public api tests
                                                    - move jetty libraries to 3rd party
                                                    - remove JettyComponent as a Spring bean and change how it's constructed
                                                39854: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                                                39856: Re-instate tests.
                                                39857: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - removed cmisatom url binding (opencmis is now at .../public/cmis/versions/1/atom)
                                                39926: Fix for CLOUD-442: "Public API : Tagging + Paging"
                                                39927: Fix for CLOUD-442: "Public API : Tagging + Paging"
                                                     - updates to public api tests
                                                40185: Make sure LockService is injected into CommentService
                                                40186: Make sure LockService is injected into CommentService
                                                40187: Changes resulting from sprint demo:
                                                    - changes to network and network membership representation
                                                    - embed modifiedBy person object in comment
                                                40211: Changes resulting from sprint demo:
                                                    - changes to network and network membership representation
                                                40212: Fix intermittently failing test
                                                40223: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     - removed browser binding for now
                                                40224: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" (Thor-specific changes)
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     - removed browser binding for now
                                                40225: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     - removed browser binding for now
                                                40254: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                40255: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                40256: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                40270: Turned stacktrace into a String
                                                40339: CLOUD-488: "The activities feed in the public API is not returning all required summary data for comments"
                                           40548: Merged PATCHES/V4.0.2 to BRANCHES/DEV/THOR1_REST_API2:
                                                40526: Fixed ALF-15540: CMIS: Synchronized block in service interceptor
                                           40644: Public api:
                                           40645: Public Api:
                                           40646: Public Api:
                                           40649: Public api:
                                           40650: Public api:
                                           40657: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                                                40515: CLOUD-390: Content models to be filtered out of Cloud CMIS implementation
                                                40550: Public api:
                                                    - updates to datetime property names
                                                40552: Public api:
                                                     - sort sites by site title (by default)
                                                40596: Removed "system" from exclusions for CLOUD-495
                                                40610: CLOUD-495: F414: Add multiple tags to a folder or document
                                           40674: Public api:
                                           40675: THOR-1324: "F414: Add multiple tags to a folder or document"
                                           40676: Public api:
                                           40678: Public api:
                                           40715: Public api:
                                           40730: Merged /alfresco/BRANCHES/DEV/THOR1_REST_API1:r40724  Better meta-data handling for PUT requests
                                           40731: Merged /alfresco/BRANCHES/DEV/AMILLER/CLOUD-496:r40659: CLOUD-500: Add trusted auth with key validation.
                                           40732: Fixed failing test
                                           40739: Merged BRANCHES/DEV/V3.4-BUG-FIX:r40193: ALF-15307 / ALF-15190: FTS indexing can stick forever on purged nodes - May cut 50 minutes off the build time when merged
                                           40742: Public api
                                           40801: Public api:
                                           40802: Public api
                                           40803: Public api
                                           40804: Public api
                                           40807: Public api
                                           40811: Public api
                                           40815: Public api:
                                           40826: Public api
                                 41108: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      40898: Fix build
                                 41110: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      40903: Fixed solrcore properties (merge error)
                                 41111: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41007: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           40998: CLOUD-563: "View external member of the site if internal user is not a member of a site."
                                 41112: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41048: Merged DEV/V4.1-BUG-FIX to DEV/CLOUD1
                                            40382: Fix for ALF-15491 SOLR is generating queries for lucene style cross-language support
                                            40632: Fix for ALF-15487 Search not working for queries containing 3-digit versions
                                                   Fix for ALF-15356 SOLR doesn't support searching by cm:name of file with underscore and dots
                                            40662: Eclipse classpath fixes
                                            41032: Fix for ALF-15753	Infinite loop during Solr ACL indexing when ACL Changeset batch is empty
                                 41245: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41128: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                           41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                           41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                           41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                           41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                           41126: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                40364: Testcase for ALF-15178, which is not reproduced.
                                                40419: Fix for the MLText parts of ALF-15502.
                                                40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
                                           41127: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                41121: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                                                     41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                     41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                     41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                     41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41123: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                                                     41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                 41247: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41149: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41146: Fix trusted authentication against OpenCMIS
                                 41248: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41157: BDE-73: finish adding all the code into Sonar report. Tests are not there yet.
                                 41249: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41180: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           40482: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
                                              - ALF-15453: Incorrect manage permissions working for a file/folder   
                                           Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                              40486: ALF-15453: Incorrect manage permissions working for a file/folder
                                 41250: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41185: BDE-73: Add back web-framework-commons to fix reporting
                                 41251: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41192: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                 41252: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41209: BDE-73: workaround MDEP-98 encountered with Sonar
                                 41253: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41212: CLOUD-610: "Public APIs causing problem with mobile app"
                            44553: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 41293: Cloud SPP only: fix IDE project dependency and classpath for PublicApiTest (and others no doubt) to run.
                                 41294: Cloud SPP: ensure vti and thor module dependency is handled correctly.
                                 41312: Fix build problem: some unit tests had been split out and needed the sharepoint module on the classpath.
                                 41379: Cloud SPP: remove remote-api dependency from repository.
                            44554: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 41695: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41114: Merged DEV\V4.1-BUG-FIX to DEV\CLOUD1
                                            40977: (Record only) Sync parser generation
                                 41696: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41302: CLOUD-622: "Mobile App connection to testmy build 227 issue"
                                 41698: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41375: BDE-73: remove never-ending test for reporting
                                 41699: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41377: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           40859: public api:
                                           40862: CLOUD-555: "Updating comment fails because node not found"
                                           40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                           40979: Added tests for non-numeric params and non-european characters
                                           41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                                41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                           41097: Added quickshare and cloudsync to cmis filter list
                                           41098: Renamed serializer/deserializer lists for RestJsonModule
                                           41099: Cleaned up consistent Rest responses - CLOUD-574
                                           41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                           41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                           41105: Added key for trusted layer7 relationship
                                           41137: Public api:
                                           41168: Public apI;
                                           41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                           41170: public api:
                                           41171: public api:
                                           41172: public api:
                                           41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                           41186: Fix solrcore properties
                                           41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                           41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                           41325: Public api:
                                           41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                           41369: Public api:
                                 41700: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41474: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41422: Sample OAuth call for the Resource Owner Password flow
                                           41427: Sample OAuth call for the Client Credentials flow
                                           41433: Public api: (1) parameterize site members/people sorting in service api
                                           41434: Public api: minor comment service fix
                                           41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41439: Public api: fix for default tenant id in CMIS requests
                                           41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                           41457: Fix build
                                           41461: Public api: more tests
                                 41701: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41560: CLOUD-657: "cmis root service document returning incorrect urls"
                                 41702: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41627: CLOUD-676: "OpenCMIS Returns Error 500 on GET: https://testp.alfresco.me/alfresco/a/cmis/versions/1.0/atom"
                                 41703: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCuHES/DEV/CLOUD1_SP:
                                      41670: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                           41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                           41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                           41628: Public api: more tests
                            44555: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 41709: CLOUD-640: Notification is not displayed for consumer for updating/editing document added by other user
                                 42331: Cloud SPP: really fix import order.
                                 42364: Cloud SPP: fix Spring bean filename typo.
                                 43078: CLOUD-868: incorrect URL for Sharepoint protocol
                                 43153: CLOUD-747: SPP: Checking document out doesn't work
                                 43221: CLOUD-896: Unable to open specific version of document from MS Word
                                 43222: CLOUD-896: Unable to open specific version of document from MS Word
                                 43247: CLOUD-896: missing class CloudVersionsServiceHandler from previous commit.
                                 43256: CLOUD-896: fix broken test
                            44556: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 43472: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41710: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41672: CLOUD-672: "404 Error when browsing child files/folder "
                                           41673: Public api: more tests
                                           41675: CLOUD-674: "Root network calls need to return application/json content type"
                                      41754: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                           41677: No-op skeletons of Public API gateway filter and URL rewrite filter
                                           41683: Url rewrite rules for new and old-style public api
                                           41705: First working version of gateway filter
                                           41732: Trim authenticator keys from config
                                           41734: Productising code - tests and bug fixing with layer7, code tidyup, configuration, error handling
                                           41753: SSL support for accepting self-signed certificates
                                      41794: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                           41792: Fixes for Gateway authentication filter after end to end testing on staging.
                                      41798: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                           41797: Ensure authentication filter provides enough info to gateway for full analytics
                                      41815: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                           41814: Fix regression where old style apigee route failed
                                      41842: CLOUD-619: "CMIS query for objectId throws exception"
                                      41843: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41823: Public api: more tests
                                           41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                      41855: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                      42005: Merged BRANCHES/DEV/FEATURES/CLOUD1_DAM to BRANCHES/DEV/CLOUD1:
                                           37644: Resolve CLOUD-34: Incorporate Gallery View
                                           39105: Moved to AMP produced from modules/dam/BRANCHES/V1.0 with overrideSource=cloud build property
                                           39268: ALF-13984: High Resolution Mime-Aware Place Holder Icons
                                                - Implemented in DAM 1.0.2.0
                                           39651: Deployed DAM module version 1.0.3 to CLOUD1_DAM which fixes:
                                                - CLOUD-380: Document library displayed incorrectly in Gallery view in IE7
                                                - DAM-36: CLONE - Document library displayed incorrectly in Gallery view in IE7
                                                - DAM-37: Gallery View: No Border Around Selected Items in IE7
                                                - DAM-38: Gallery View: Two Items Must be Selected in IE7 for Multi-select Actions
                                                - DAM-39: Gallery View: Slider Behavior is Erratic in IE7
                                                - DAM-40: Gallery View: Upload Instructions Throws Error in IE7
                                           40083: CLOUD-378: Drag and drop within document library doesn't work in Gallery view
                                                - Deployed DAM 1.0.4.0
                                           40507: Changed name of DAM module to Media Management
                                           40534: Version 1.0.5.1 of MM module which includes:
                                                - DAM-61: Multi-Select Checkboxes Are No Longer Present in 1.0.5
                                           40723: Deployed version 1.0.5.3 of the Media Management module which includes fixes for:
                                                - CLOUD-544 / DAM-66: 'Share' Link Displayed Incorrectly on Info Panel
                                                - CLOUD-543 / DAM-65: Gallery View Content Display Should Support Dynamic Changing of Browser Width
                                           41174: Deployed Media Management module 1.0.5.4 which includes:
                                                - DAM-67: Gallery View Changes the Size of Dragging Thumbnails in Other Views
                                                - DAM-68: Gallery VIew Should Hide Its Container on destroyView
                                                - DAM-69: Gallery View Resizing Should Fire Only When Resizing has Stopped
                                                - DAM-71: Gallery View Thumbnail Generation Should Accept Thumbnail Definition Parameter
                                           41536: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                40870: m.share fixes
                                           41537: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                40919: m.share fixes
                                           41538: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                41432: Fixed CLOUD-587 "Drag and Drop Changes Conflict with Hover Events on Touch Devices"
                                           41614: Changed version of gallery view only MM module to 0.1
                                           42004: Upgraded to MM 0.1.5.5 which contains fix for DAM-74
                                      42047: Merged DEV/CLOUD_SIGN_UP into DEV/CLOUD1 (cloud priority 
                                      42049: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1:
                                          41674: ALF-15967: Using START_USER_ID_ instead of "initiator" property to query process instances started by user X to prevent extra joins + removed unused constants
                                          41650: Fixed CLOUD-667: Merged fix for ALF-14438 into CLOUD1-BUG-FIX + using START_USER_ID_ instead of custom "initiator" property to query initiator to boost performance even more
                                      42050: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1:
                                          41674: ALF-15967: Using START_USER_ID_ instead of "initiator" property to query process instances started by user X to prevent extra joins + removed unused constants
                                          41650: Fixed CLOUD-667: Merged fix for ALF-14438 into CLOUD1-BUG-FIX + using START_USER_ID_ instead of custom "initiator" property to query initiator to boost performance even more
                                      42121: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                                           39663: CLOUD-153 - Invite box doesn't parse email addresses properly
                                      42160: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                                           38864: CLOUD-41 - Resize logo banner on upload
                                           38878: CLLOUD-42 - Image previews should be larger
                                      42199: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                           41113: Creating new [bug fix] branch from BRANCHES/DEV/CLOUD1
                                           41211: QuickShare: CLOUD-593: prevent copying of QuickShare props on node copy [+ minor refactor]
                                           41612: QuickShare: Merged form THOR1_QUICK_SHARE to CLOUD1-BUG-FIX
                                              36363: QuickShare: Improvment for THOR-1268 "F378: As a user I can choose to share a document"
                                           41639: QuickShare: Fixed bug where the display of quickshare was based on the showComments property
                                      42200: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
                                      42201: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
                                      42203: CLOUD-71: Patch was there, but reference to it from "postUpgrade..." was lost in merge, preventing it from being executed
                                      42204: Merged BRANCHES/DEV/HEAD_QUICK_SHARE_TMP to BRANCHES/DEV/CLOUD1:
                                           41733: QuickShare: fix ShareContentGet NPE (fix for Document Details redirect if logged in)
                                      42206: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                           41213: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource
                                           41214: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource (DO NOT MERGE to Enterprise/HEAD)
                                           41270: CLOUD-452 / ALF-15823: reconfigure Activities DAOs to use common Alfresco datasource
                                      42209: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                           41292: CLOUD-520: Convert TicketCleanupJob to a StatfulJob
                                           41410: CLOUD-119: Change status code to 409 (Conflict), from 400 (Bad Request), when parent folder does not exist
                                      42211: Fix pesky solrcore.properties ... remove hardcoded amiller ;-)
                                      42231: CLOID-71: TEMP - comment-out previous r42203 (breaks build/tests)
                                      42241: Updated Media Management module to 0.1.5.6 which contains fixes for:
                                           - CLOUD-740/MM-76: Empty space in the page footer when switching to Gallery View
                                           - CLOUD-741/MM-75: IE7: Opacity of Folder Icon not Rendered Correctly in Gallery View
                                           - CLOUD-741/MM-77: Gallery View Continually Recalculates Height in IE
                                           - CLOUD-753/MM-78: Links for 'Create a folder' and 'Upload files' in the Empty Folder Instructions Don't Work in Gallery View
                                           - MM-79: Disable Fade Animation on Resize of Gallery View
                                      42252: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                                            42233: Fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
                                                   and related CLOUD-760 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
                                      42267: CLOUD-153: Update CloudInvitationServiceImpl to only use the address part of an email string and ignore the personal name. 
                                      42285: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41867: CLOUD-711: "It should be possible to remove a favourite site"
                                           41957: Public api: - error handling improvements - more tests
                                           41970: Public api: - fix build  (add missing files)
                                           41972: Public api: - more tests (including OpenCMIS TCK)
                                           42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                           42058: Public api: changed logging package name
                                           42124: Public api: - more tests - minor fixes
                                           42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                           42126: Public api: fix up OpenCMIS tests
                                           42171: Consistency fix for CLOUD-695.
                                           42180: Fix build
                                           42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                           42214: Public api tests (cmis)
                                           42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                           42253: Fix build
                                      42288: Fix build - fix merge problem
                                      42302: Updated Media Management module to 0.1.5.7 which contains fixes for:
                                           - CLOUD-788/MM-89: "Rename" Icon is not Displayed Correctly in Gallery View
                                      42320: Fix build (fix dodgy merge)
                                      42334: Fixed build of Media Management module for:
                                           - CLOUD-789/MM-91: MM AMPs Produced No Longer Contain module.properties
                                      42341: Fixed CLOUD-755 "Label needs to be renamed and icon should be present"
                                      42344: Fixed CLOUD-755 "Label needs to be renamed and icon should be present" part 2
                                      42365: CLOUD-153: Fix additional invite paths.
                                      42373: Updated Media Management module to 0.1.5.8 which contains:
                                           - MM-92: Change Default View for Cloud to Detailed Rather than Gallery
                                      42513: CLOUD-808: fixed issue with timers due when alfresco boots
                                      42577: CLOUD-808: Fix for timer deploying MT-process when shared is required caused test to fail
                                      42588: BDE-73: fix compilation + switch to MySQL to make cloud tests pass 
                                      42595: Add salesforce modules to privatemodules.  Contains only models.
                                      42596: Add salesforce module build properites and ant build tasks.
                                      42601: Updated salesforce amp with correct version number and updated module-context.xml
                                      42668: BDE-73 Fix Sonar reporting
                                      42709: FRENCH: Translation updates based on EN r42416
                                      42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch
                                      42871: GERMAN: Cloud Translation, based on r 42416
                                      42879: SPANISH: Cloud Translation, based on r 42416
                                      42890: ITALIAN: Cloud Translation, based on r 42416
                                      43120: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                                           43100: Update the salesforce amp to include the CORS Filter
                                           43101: Update web.xml to enable to the CORS Filter with filter-mapping
                                           43117: Add updated amp with removed CORS Filter.  CORS Filter is now available in 3rd-party libs
                                           43118: [CLOUD-724] Add CORS Filter jar to 3rd-party libs
                                           43119: [CLOUD-724] Add missing jar java-property-utils-1.6.jar to 3rd-party libs
                                      43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers
                                      43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
                                           42257: CLOUD-649: Updates UI action for Granular Permissions
                                           42295: CLOUD-33: Updates labels
                                           42303: CLOUD-651: Limit user search to site members only.
                                           42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
                                           42427: Removes multi-select manage-permissions dialogue.
                                           42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
                                           42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
                                           42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
                                           42807: CLOUD-863: Reordered code to avoid AccessDeniedException
                                           43259: CLOUD-901: Revert showComments check so it handles undefined permission
                                           43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
                                           43307: CLOUD-900: Follow-up fix
                                      43353: Fix for remote transform server with new cloud environment
                                      43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
                                           39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                                                Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                                                  36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                                                     - Will be revisited to add better comments
                                                  36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                                                     - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                                                     - Better code documentation
                                                     - Removed dev/test code
                                                     - Improved error config handling
                                                  36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                                                     - Changed "link" parameter to "href" (instead of "page") to match actions.
                                                  39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                                                  39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
                                           39875: Configurtion changes to enable Google Docs V2 within the web tier.
                                           39881: It's extension ... not extention
                                           39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
                                           39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
                                           40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
                                           40624: Update Google Docs AMPs
                                           40635: Merge Google Docs Cloud AMPS to Feature Branchs
                                           40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
                                           40897: Google Docs AMP update 
                                           41165: Merge Updated AMPs for [GOOGLEDOCS-83]
                                           41179: Update AMPs for [GOOGLEDOCS-87]
                                           41262: Update AMPs for GOOGLEDOCS-89
                                           41493: Update AMPs for [GOOGLEDOCS-93]
                                           41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
                                           41805: Update AMPs for [GOOGLEDOCS-101]
                                           41840: Add AMPs with i18n strings
                                           43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
                                           43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
                                           43320: Add googledocs repo declaration
                            44557: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 43751: CLOUD-747: SPP: Checking document out doesn't work
                                 43765: CLOUD-747: fixes ${localname} substitution in vti.server.external.host value
                                 43780: CLOUD-747: Sharepoint version of PROPFIND handler must return 'href' containing the externally visible base URL
                                 43785: CLOUD-747: fix for proxied repository - more robust parsing of URLs.
                                 44001: Fix pesky solrcore properties
                                 44036: Resolve CLOUD-877: UI button for SharePoint Protocol needs to be updated
                                 44211: CLOUD-747: checkout/checkin works for spaces in document
                            44564: Fix construction of vti activity processor after merge
                            44565: Remove unnecessary build of war and amps for exploded target (NOTE: may fail in continuous build)
                       44573: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/CLOUD1:
                            44572: Clean up of unused files.
                       44575: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                            43592: (RECORD ONLY) Rebase CORS Filter with the latest CLOUD1
                            43593: (RECORD ONLY) Add CloudTenantWebScriptServlet endpoint /a to CORS filter mapping
                            43718: (RECORD ONLY) [CLOUD-955] Add new web script tennant service to seperate public api from web script api
                            43749: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                            44517: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                       44576: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                            44518: [CLOUD-955] Change CORS filter-mapping to use servelet instead of url
                       44691: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                            44688: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                            44689: [CLOUD-1072] Add public api url to CORS filter mapping.  Move CORS filter mapping to live above the publicapi filter mappings.  OPTIONS calls made to the CORS filter should be evaluated before Layer7 authentication.
                       44752: BDE-73: Fix Maven build now that thor module depend on sharepoint
                       44890: BDE-73: Fix Maven test execution of thor project now that it depends on sharepoint
                       45271: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                            44289: PUBLICAPI-43: "CMIS endpoints need to report incorrect methods as a 405 error"
                            44707: PUBLICAPI-56: "Creating comments can fail intermittently"
                                 - tests to follow
                            44742: CLOUD-1073: "Unable to upload documents intermittently"
                            45070: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: (PUBLICAPI-57)
                                 Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                                    44688: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                                    44689: [CLOUD-1072] Add public api url to CORS filter mapping. Move CORS filter mapping to live above the publicapi filter mappings. OPTIONS calls made to the CORS filter should be evaluated before Layer7 authentication.
                            45168: CLOUD-1140: Activities PostLookup : "Skipping activity post 1234567"and occasionally "Exception during update of posts" (due to InvalidNodeRefException)
                            45169: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 45082: CLOUD-1139: Cloud feednotifier running on 2 boxes
                  45354: Fix fo CLOUD-422: Activiti causes server to block on all threads
                  45389: Re-instate CMIS TCK tests (hopefully these will now be ok after the fix for PUBLICAPI-57)
                  45510: Revert re-instated CMIS TCK tests (not sure why, but didn't seem to work)
                  45658: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43027: Merged DEV to V4.1-BUG-FIX
                             42426: ALF-15577: " does not support the method HEAD " when opening a MS Access file with "View In Browser"
                  45665: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45622: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
                            35614: ALF-13807: Add range header support to the webDAV servlet
                  45671: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45651: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
                            45222: ALF-17387: Support For HTTP Range Requests in Repository WebScripts
                                 - Added HttpRangeProcessor.processRange which takes a WebScriptResponse parameter instead of HttpServletResponse
                                 - Changed HttpRangeProcessor.processSingeRange and HttpRangeProcessor.processMultiRange to accept a generic Object parameter then cast to the appropriate WebScriptResponse or HttpServletResponse
                                 - Added Javadoc to HttpRangeProcessor.processRange
                                 - Changed StreamContent.streamContentImpl to add code from BaseDownloadContentServlet which does the work of processing the range header from the request
                                 - Changed StreamContent.streamContentImpl method signature to accept nodeRef and propertyQName parameters needed for multi-range requests
                                 - Modified methods which override or call StreamContent.streamContentImpl for new method signature, passing in nodeRef and propertyQName or nulls where appropriate
                  45674: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45653: ALF-17578: Height of Video Player is Too Large on iPad
                            - Added max-height for videos
                  45701: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45475: Fix for ALF-17510 - Upgrade of htmlparser from 1.6 to 2.1
                  45837: A fix for updated HtmlParser lib
                  45937: Revert inadvertent commit, r45933
                  45970: CLOUD-1077: File size limits for Transforms need increasing for Cloud
                  45980: CLOUD-216, CLOUD-256, CLOUD-878 - Pagination problems in Manage Users section of admin console
                  45988: CLOUD-1234: Incorrect mime type for thumbnail image-preview for document details page
                       - Updated to version 0.1.5.11 of MM module which changes the mimetype of imgpreview to jpeg
                  46012: CLOUD-216, CLOUD-256, CLOUD-878 - Pagination problems in Manage Users section of admin console
                  46080: Merged BRANCHES/DEV/FEATURES/CLOUD1_METRICS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       44536: CLOUD-174: Initial web script based monitoring 
                             - Added authentication event listener mechanism to web script authenticatorn
                             - Created implementation of listener which exposes concurrent user metrics via jmx.
                       44560: CLOUD-174: Fix broken unit test
                       44615: CLOUD-174: Fix unit tests.
                       44659: CLOUD-174: Add WebDAV and SharePoint request tracking
                       44662: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_METRICS:
                            44373: Follow-up on big merge r44059 for Maven build
                                 - Upgrade POI to 3.9-beta1-20121109-alfresco-patched
                                 - Upgrade JODConverter to 2.1.0-patched
                                 - Added Chemistry client as a dependency in Solr tests
                            44571: Merged BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN to BRANCHES/DEV/CLOUD1:
                                 44527: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      38425: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33822: Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:
                                                33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS
                                                33821: ALF-12212 - SPP/Vti requires that all links include a protocol and are valid, while share does not. When building the Vti response, prefix URLs with http:// if they lack a protocol at the start, and ignore any that are malformed
                                      38431: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33893: SharePoint refactoring - first part of removing the old Alfresco v2 code
                                      38432: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33905: SharePoint Refactoring - Move to only a single class for the VersionServiceHandler
                                      38433: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33906: SharePoint Refactoring - Move to only a single class for the User and Groups Handler
                                      38434: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33907: SharePoint refactoring - fix deprecation warnings by switching to the new way of finding people, when searching for a user with a given email address
                                      38435: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33923: SharePoint refactoring - Start on merging the old style and new style List support, mark the old style as deprecated, and add TODOs where needed for future changes
                                      38440: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           35486: ALF-13028: Sharepoint broken by changes to WebDAV
                                      38442: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           35530: ALF-13028, ALF-13696: broken sharepoint module
                                      38443: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           36148: Merged BRANCHES/DEV/BELARUS/HEAD-2012_04_25 to HEAD:
                                                35710: ALF-13028 : Sharepoint broken by changes to WebDAV
                                      38444: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37648: Sharepoint: fixed typo in class name VtiDocumentHepler
                                      38447: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37929: First try at incremental-spp-tomcat-exploded target
                                      38451: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37943: Sharepoint: fix build for compile-spp dependency and for new incremental-spp-tomcat-exploded target.
                                      38453: Sharepoint: remove error causing property injection - probably came from a double-merge.
                                      38472: Sharepoint: fix missing singletonCache property for VtiPathHelper bean, probably lost in merges.
                                      38477: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37926: Correct handling of GetMeetingsInfo - lcid may not always be set
                                      38478: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37927: More parameters that are optional
                                      38481: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37928: More parameters that are optional
                                      38483: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37931: A site may not have a calendar container yet
                                      38485: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37933: Set the response type to text/xml as required
                                      38486: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37938: Stub out support for UpdateMeeting and SetWorkspaceTitle
                                      38487: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37939: Fix title vs name confusion in meeting sites, support setWorkspaceTitle, and correct the error reporting on create site
                                      38488: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37940: SPP Vti SOAP error codes must be zero padded to 8 characters
                                      38489: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37941: Improve error handling in create/set title/delete, and match the required error codes
                                      38491: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38005: Correct logic to fix test
                                      38493: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38006: DTEND is optional in iCal, if not set it means the meeting ends at the start time
                                      38494: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38007: Pull out commong workspace related code to a parent endpoint class
                                      38496: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38009: Sharepoint [MS-VERSS]: GetVersions should state whether file has versioning enabled.
                                      38498: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38011: More refactoring to use the new commong workspace parent endpoint
                                      38501: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38012: Start to clean up how exceptions are done in the meeting handler layer
                                           38013: Start to refactor the common parts of meetings to a parent abstract class, and stub out the SetAttendeeResponse endpoint
                                           38014: Fix import warnings
                                           38015: More towards Add/Update/Restore meeting
                                           38016: Common building of the MeetingBean
                                           38017: Improve error reporting on add/update meeting, to match the spec requirements
                                           38018: Sharepoint [MS-DWSS]: CanCreateDwsUrl returns GUID if requested name is empty string.
                                           38019: ALF-14687 - ISO8601 dates from non-Alfresco sources may have more than 3 millisecond digits
                                           38020: Stub out the SetAttendeeResponse endpoint, but the handler does nothing with the details
                                           38021: More meeting exception improvements
                                      38503: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38077: Refactor the Meeting related endpoints to use common superclasses, and fix some common problems / exception handling in the process
                                           38078: Further error handling checks
                                      38504: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38080: Match the rather strange behaviour of getMeetingsWorkspaces and the recurring flag, as set down in the spec
                                      38505: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38088: Sharepoint [MS-DWSS]: partial fix to XML fault message generation.
                                           38089: Sharepoint [MS-DWSS]: fuerther partial fix to error message generation for CreateDws.
                                      38506: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38091: Sharepoint [MS-DWSS]: S1_TC08: returning error with AlreadyExists but should be ServerFailure.
                                      38507: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38093: Support filtering by boolean properties, as well as String ones, in GetChildrenCannedQuery
                                           38094: Support for listing calendar entries by their outlook status (isOutlook / OutlookUID), via a Canned Query
                                           38095: De-Lucene the SharePoint / Vti Meeting Service handler, using the new CalendarService list method
                                           38096: Sharepoint [MS-DWSS]: S1_TC09 and others, hyphens in GUID were being translated to underscores.
                                           38097: Vti/SPP support for restoring a deleted meeting (assuming it is still available in the archive store)
                                      38508: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38099: Make the error message a bit more helpful, in the case that the assoc qname is too long
                                           38100: Check for errors from the create site share call
                                           38101: Validate that the site Short Name isn't too long during creation, and throw a helpful exception if it is. (Site Short Names get used in Authority Names, which are limited by the DB model to 100 characters)
                                           38102: Update the site name max length check - need to account for the role group names too
                                           38103: There is a maximum size of a site short name, based on the limits of the authority names in the permissions service, so truncate the Vti/SPP site name before creation to fit within that
                                           38104: Specific error response needed for GetMeetingsInformation on a subsite
                                      38509: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38134: Sharepoint [MS-VERSS]: S1_TC05 removed manual entity encoding of quotes, as dom4j was then escaping the ampersands.
                                      38510: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38139: Sharepoint [MS-DWSS]: fixed error message generation for CreateFolder.
                                           38140: Sharepoint [MS-DWSS]: Result element should be standalone XML.
                                           38141: Start removing deprecated, old style lists in favour of the full list support
                                      38511: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38143: Improve handling of abstract lists, and convert more classes to use that method
                                           38144: More convertions to AbstractListEndpoint, and improve logging by centralising it better
                                      38512: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38146: Prepare to do more of the List details not via hard coded FTL
                                           38147: Convert to only having the fields hard coded in the ftl, and the rest dynamically generated
                                           38148: Remove deprecated old style ListBean (now all replaced with ListInfoBean), and tidy up around the removal
                                      38514: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38156: Start on processing the request for UpdateListItems, and support GetList by UID as well as Name
                                           38157: Sharepoint [MS-WEBSS]: fixed GetWeb to respond with the "context site" if "." or "" requested in SOAP body.
                                      38515: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38229: Improve the list definition model, and add more support for UpdateListItems
                                      38516: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38231: Refactor the current (rather hard coded) GetListItems support into an abstract class, and then use that to stub out the other two GetListItems* endpoints
                                           38232: Sharepoint [MS-WDVMODUU]: implemented WebDAV PUT method.
                                           38233: Stub out Change Since support
                                      38517: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38237: Improve error handling, and reduce some duplication
                                           38238: More details needed
                                           38239: Use the same rendering of a list details
                                      38518: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38381: ALF-14835: Sharepoint/WebDAV: exclusive lock fails deemed to be owned by someone else.
                                           38382: Sharepoint [MS-WDVMODUU]: activity posting disabled upon DELETE.
                                      38785: Merged alfresco/HEAD to alfresco/BRANCHES/DEV/CLOUD1_SP:
                                           38752: WebDAV/Sharepoint: extracted WebDAVHelper to spring configuration.
                                 44543: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      38996: WebDAV: added getUrlPathPrefix tests for WebDAVHelper.
                                      38997: WebDAV: added setter for urlPathPrefix property (to aid in spring config), ensures path prefix terminated in slash.
                                      39001: WebDAV: getURLForPath(...) appends trailing slash to path prefix if missing.
                                      39002: WebDAV: removed redundant createDAVHelper() method.
                                      39016: WebDAV: added getRepositoryPath(request) method (replaces WebDAV's static method)
                                      39017: WebDAV: replaced use of static WebDAV.getRepositoryPath(req) with non-static version in WebDAVHelper.
                                      39019: Cloud/SPP: thor module must have dependency on SPP module.
                                      39020: Cloud WebDAV: CloudWebDAVServlet no longer uses static getRepositoryPath(req) method.
                                      39021: Cloud WebDAV: override getRepositoryPath(req) with version that gets path within tenant.
                                      39023: SPP core: added hook to VtiWebDavAction to allow overriding of execution behaviour.
                                      39025: SPP: minor logging improvement.
                                      39026: SPP: define SPP version of WebDAV helper and inject into VtiWebDavAction instances.
                                      39060: Cloud SPP: introduced cloud/spp webdav helper.
                                      39061: Cloud SPP: missing part of commit, moved methods out of CloudWebDAVHelper and into SPPCloudWebDAVHelper.
                                      39095: Cloud WebDAV: move doclib URL munging out of core WebDAV.
                                      39182: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39167: WebDAV: remove static replace(str, repl, with) method.
                                      39185: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39172: WebDAV: removed static WebDAV.getRepositoryPath() method. Only use the non-static version.
                                      39186: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39173: WebDAV: fix broken code from moving inlining of getRepositoryPath(...) from WebDAV to WebDAVHelper.
                                      39187: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39174: WebDAV: removed redundant DIR_SEPARATOR constant.
                                      39189: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39178: WebDAV/SPP: remove static WebDAV.getURLForPath(...) methods.
                                      39323: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39203: WebDAV: fix broken UnlockMethodTest.
                                      39324: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39204: WebDAV: fix broken WebDAVMethodTest.
                                      39325: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39309: Sharepoint: no longer uses sysAdminParams to determine incoming URL path prefix.
                                      39330: Sharepoint: fix code broken by merge -c 39325 (from HEAD).
                                      39346: Cloud/sharepoint: fix for merge from HEAD, -c 39309 (remove sysAdminParams as supplier of URL path prefix)
                                      39365: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39364: Sharepoint: making PROPFIND more tolerant of null values in a node's properties.
                                      39474: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39473: WebDAV: introduce getChildren() method for helper.
                                 44544: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      39541: Sharepoint: added test for decomposeDocumentURL functionality.
                                      39552: Sharepoint: added doDecomposeURLWork test for incorrect URI path prefix.
                                      39570: Sharepoint: refactoring for cloud overrides and testing improvements.
                                      39674: SPP core: use VtiPathHelper.getPathForURL() instead of using request directly.
                                      39676: SPP core: refactored action execution to provide hook for subclasses.
                                      39695: SPP: null GUID no longer results in an empty rid{}
                                      39696: SPP core: VtiWebDavAction - setting the method's details is delegated to the DAV executor.
                                      39698: SPP core: added hook for detecting whether a URI path does not specify a site.
                                      39701: SPP core: abstract parent for vtiRequestDispatcher makes it possible to override bean and inherit configuration.
                                      39702: SPP core: move support methods from test class into abstract base class.
                                      39705: SPP cloud: added cloud specific filter and path helpers.
                                      39707: SPP cloud: remove redundant code from CloudwebDavExecutorImpl
                                      39708: SPP cloud: introduce request handling logic in common for WebDAV and SPP.
                                      39709: Cloud SPP/webdav: WebDAV uses common request handling class.
                                      39710: SPP cloud: SPPCloudWebDAVHelper was incorrectly stripping off tenant domain for getRepositoryPath().
                                      39712: SPP cloud: introduce a cloud-specific VtiRequestDispatcher.
                                      39723: SPP core: servlet filter now registered for forwards as well as fresh requests.
                                      39724: SPP core: removed URL decoding of URL in XML response generation.
                                      39759: SPP core: use separate servlet mappings for /alfresco/* and /*
                                      39865: Cloud SPP: cleaned up runAsTenant usage.
                                      39868: SPP cloud: missing files from previous commit ("cleaned up runAsTenant usage")
                                      39916: CLOUD-28: cloud SPP raises activity posts for PUT, DELETE.
                                      39930: Cloud SPP: tenant domain is extract from RPC method request with "url" parameter, instead of through request URL path.
                                      39941: Cloud SPP: reintroduced separate instances of CommonRequestHandling that was lost by moving instantiation into spring.
                                      39971: CLOUD-137: 4.4 Add Mixpanel Analytics events to SharePoint Protocol
                                      39972: CLOUD-137: 4.4 Added an "spp" event source.
                                 44545: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      40006: Bamboo/CI: added dependency on spp module when building cloud.
                                      40007: WebDAV - cloud only: added missing WebDAVHelper constructor argument to spring definition.
                                      40015: Cloud SPP: bake SPP module into WAR file at build time.
                                      40027: Cloud SPP: Committing binaries that can be used by ops for testing/prototyping.
                                      40365: WebDAV/SPP: moved webDAVLockService bean definition into webdav-context.xml
                                      40366: WebDAV/SPP: moved webDAVLockService to remote-api-context.xml
                                      40368: SPP: removed circular task dependency.
                                      40373: Cloud SPP: added incremental-spp-tomcat-exploded as dependency of incremental-cloud-repo-exploded
                                      40376: Test to see if this fixes build failures, by adding SPP classes/config to unit testing classpath.
                                      40380: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38861: WebDAV: fixed dependency problem; fixes test RepositoryStartStopTest.
                                      40384: Cloud SPP: ensure jetty libs on classpath during test.
                                      40392: Cloud SPP: remote-api-context.xml must be loaded before cloud and SPP modules.
                                      40400: Cloud SPP: fix classpath to use fileset instead of pathelement.
                                      40444: SPP build problems: attempt to ensure thor config comes after SPP config in unit testing classpath
                                      40447: Cloud SPP: ensure SPP module is loaded prior to cloud module.
                                      40450: SPP Cloud: backing out change 40444 (CI build changes)
                                      40451: SPP Cloud: another attempt to straighten out testing classpath problems.
                                      40456: Temporarily disabling explicit SPP module import.
                                      40483: Cloud SPP: fixed broken test and clarified behaviour in comments.
                                      40519: Cloud SPP: remove exclusion of module.properties when copying resources during deploy-spp-tomcat-exploded ant target.
                                      40523: CLOUD-25: 3.1 The protocol must be secured using the user's standard Cloud credentials
                                 44546: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      40551: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           38401: Fix activities feed mail notifications.
                                           38614: Resolve CLOUD-157: Cloud1 does not deploy due to addDutchEmailTemplates patch failing
                                           38676: Exclude irrelevant tests even if minimal.testing? flag is not set
                                           38726: Resolve CLOUD-160: "Data too long for column 'report' at row 1" when deploying Cloud1-144 to Test
                                           38734: Fix CLOUD1 build to ensure test results from previous builds are cleaned
                                           38754: Fix test
                                           38765: Merged BRANCHES/V4.0 to BRANCHES/DEV/CLOUD1:
                                                37766: Fix for ALF-14529 Share Solr admin console page shows "Unavailable: 05120041...
                                                37800: ALF-14145 Flash preview quality is poor
                                                     - Reverting change r30483 V3.4-BUG-FIX Sept 13 2011 for ALF-9417
                                                           swf.encoder.params=-s zoom=72 -s ppmsubpixels=1 -s poly2bitmap=1 -s bitmapfonts=1
                                                       being changed back to:
                                                           swf.encoder.params=-s poly2bitmap,subpixels=72
                                                       The original 001-Cover_Cover.pdf file from ALF-9417 does now preview in 4.0.2
                                           39058: CLOUD-190: Ensure that sub-folders of folders named "res" and "proxy" can accessed.
                                           39206: Fixed CLOUD-198 "WASA - XSS issue with quickshare"
                                           39210: Cloud1 build fix
                                           39236: Fixed and baked in Share Hazelcast Cloud specific configuration into thor-share module. Now only need to override hz:hazelcast bean with AWS key specifics for test/production.
                                           39314: Resolve CLOUD-203: WebDAV incorrectly handles file / directory names with spaces in them
                                           39341: Resolve CLOUD-181: Webdav Cluster Failiure in Cloud1 build 148 startup error: java.lang.ArrayIndexOutOfBoundsException: 72
                                           39357: CLOUD-164: Remove categories from document library
                                           39358: Resolve CLOUD-186 500 error displayed when trying to add 'Content I'm editing' dashlet
                                           39388: Resolve CLOUD-185: My / Site Activities displayed incorrectly
                                           39391: Resolve CLOUD-161 Patching is taking too long - specifically patch.fixBpmPackages
                                           39499: Resolve CLOUD-395 TEST server startup log - upgrading to cloud1
                                           39500: Resolve CLOUD-187 java.lang.IllegalArgumentException: Must provide existing lockToken
                                           39554: BDE-90: Setup build for deployment of Cloud artifacts to Maven repository
                                           39559: Merged THOR1 to CLOUD1
                                                38529: CLOUD-399 / ALF-14887: User sign-up issue
                                                   - Workflow prior to mobile registration did not have the isPreRegistered property. Changed it so that if the property does not exist, it defaults to false.
                                                   - Logged warning with email address in log for easier location of error.
                                                39553: CLOUD-400 / ALF-15149: Prevent an infinite loop in AlfrescoSolrEventListener.RemoveNullEntriesCacheMatch.updateCache()
                                           39563: Merge BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to DEV/CLOUD1 (r38673-39562)
                                           39567: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39566: Allow the sync mode to be fetched by guest (it need not be hidden), then fetch from Share as guest, to avoid problems when fetching the sync mode if the current user's credentials have expired (otherwise it breaks the redirect back to the login)
                                           39568: Fix YUI options to match the version in use (-p is no longer supported)
                                           39569: Cloud is always build on top of enterprise, so remove the duplicated projects.xml taken from enterprise and use the enterprise projects.xml instead. (Fixes warnings during build)
                                           39575: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39574: Cloud lacks a guest mode, so switch to unauthenticated for the sync mode fetch (user credentials may not be available)
                                           39579: Undoing some CloudSync-specific restrictions on what test cases are run.
                                           39584: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39580: CloudSync: fix Unsync - to ensure we don't leave sync aspects (such as failed, which reappears if src file is re-synced)
                                           39586: Merged V4.1 to CLOUD1 (might fix the build)
                                                39207: ALF-15015 follow-up: make sure the first enterprise test that runs has no specific license, since we just reset the database
                                           39588: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39587: ALF-15222: Cloud Folder picker: Newly created folder isn't selected
                                           39596: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39589: ALF-15098: Folder Picker causes JS error in the document details page
                                                39561: Mark from Thor1 to V4.1 to Cloud1
                                           39602: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39076: ALF-15013 ALF-15015: Reset database before running enterprise tests, otherwise SecurityTestSuite leaves it in a bad state
                                           39608: Removed incorrect com.sun import
                                           39610: Merged HEAD to BRANCHES/DEV/CLOUD1
                                                38834: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
                                                   38607: Fix for ALF-14934 - Components YUI menus hit area is small. iPad specific CSS fix.
                                                   38631: ALF-14820 - Document Library - Upload actions and File Browse buttons (doclib, user profile image, upload vers   ion etc) - not appropriate for iOS.
                                                   38632: ALF-14934 - increased hit area for filter and tree/category nodes for ios.
                                                   38667: Repository toolbar changes for ALF-14820
                                                   38668: Patched YUI menus to support additional touch events (touchend specifically) and as custom menu events to fix   ALF-14809.
                                                   38738: Correct fix for ALF-13650:
                                                          Double byte code white spaces in front and at the end of a file name should be removed as the same behavior of    Single byte code white space. Altered Alfresco.util.trim() in order to support double byte code white spaces.
                                                           - did not handle null/defined which are returned when creating content in Wiki, Blog and Discussions.
                                                   38745: ALF-14807 - Fixes related to long file name display margins for iPad on Document Details page.
                                                   38790: ALF-14927: Ensure that RSS feed URLs are maintained in RSS dashlet when the URL contains request parameters
                                                   38792: ALF-13297 - removed install WebScript webscripts (updated Surf libs - r1094)
                                                   38831: Fix for ALF-14992 - Share: display list of rules for a folder: unterminated string literal
                                                          - actually a wider spread issue of failing to handle multiple line field values (e.g. "description" fields) wh   en rendering json into a component page or template
                                                39067: Fixed drag n drop issues for m.share on ipad
                                                       - Added ootb support for touch events to drag n drop classes in yui-patch.js
                                                       - ALF-14816 Dashboard - Cannot customize dashboard layout
                                                       - ALF-14817 Customize Site - Can't add or change the order of page components
                                                       - ALF-14822 Rules - Cannot reorder rules when multiple rules are defined on a folder
                                                       - This also means all "dividers" on the documentlibrary, discussions etc pages now work
                                           39614: Reinstate repository tests (so far, only RepositoryStartupTest is run)
                                           39615: BDE-90: do not try to deploy to Maven repo artifacts which are not built
                                           39642: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39597: CloudSync: tweak a couple of unit tests
                                                39598: CloudSync: ALF-14655 - update simple file sync (to test multiple sync'd files)
                                                39606: CloudSync: minor log level adjustments
                                                39607: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be pushed in parallel
                                                39613: Refactor of test code. SyncTrackerComponentTest now uses JUnit Rules to manage temporary content and to undo mocking out of services.
                                                39616: CloudSync: CloudSync: ALF-14483 - SyncTracker - multiple syncs (to different tgt folders) with multiple files
                                                39633: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be processed in parallel
                                                39639: ALF-15238: Bitrock Installer: Readme.txt should be updated - Alfresco version is 4.0
                                                39640: ALF-15231 Restore, with refactorings / making more general, the ability to lazy create the remote credentials container if bootstrap has not created it (eg on Cloud)
                                                39641: ALF-15230 Refactor the lazy container creation code, to use the new SystemNodeUtils helper
                                           39644: ALF-15230/ALF-15231 Disable two patches on cloud, which create new system containers, as the number of tenants means this is a large amount of work. Services will not lazy create if needed, but for on-premise we retain the up-front creation to avoid surprises and allow predictable permissions in advance if required
                                           39645: Disabling one test on CLOUD1, pending discussion with Mark, Jan.
                                           39661: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                                                39660: Fix for ALF-14244 - Sort options are not appropriate for some pre-canned Document Library queries and need disabling in the UI as they can confuse the user. Implemented by Valery Shikunets.
                                           39666: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                39665: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39664: CloudSync: ALF-14483 - SyncTracker unit tests - simple file sync test
                                           39675: Resolve CLOUD-410: Disable multi-threaded SOLR
                                           39680: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39643: ALF-15220: Indirect sync and sync failed indicators appeared together on nodes during the demo
                                                39653: ALF-15041: Cloud Sync doesn't work with IE7
                                                39670: Rework to cloud key license stuff - introduces a ValidLicenseEvent
                                                39673: New unit test for adding checked out nodes into a sync set.
                                                39677: ALF-14903 Move the Sync allowed/not-allowed check, based on Network/Tenant, to AbstractCloudSyncAbstractWebScript, and have this used by the webscripts based on this too. Then, allow UnSync to proceed no matter what the tenant status, and add unit tests
                                           39699: ALF-14454: get rid of hrtlib.jar
                                           39700: BDE-90: deploy cloud-specific artifacts
                                           39731: CLOUD-421: Merged PATCHES/V4.0.2 to CLOUD1
                                                39725: ALF-15176: Multi-threaded SOLR tracking suddenly stops leaving transactions unindexed
                                                   - Debugged on environment provided by Antonio
                                                   - If the last incomplete batch in a chunk consists entirely of empty transactions (or transactions consisting entirely of nodes updated in later transactions) it would loop forever
                                           39738: CloudSync: add default (info) Sync log level
                                           39744: Merged HEAD to BRANCHES/DEV/CLOUD1 (for BDE-73):
                                                39282: Get context from classpath rather than file system
                                                39409: fetch application context from classpath rather than file system
                                                39433: tune AVM tests to make them resilient to a change of working folder
                                                39743: Allow to override the location of test resources using a system property
                                           39745: BDE-73: Add experimental pom.xml files
                                           39755: BDE-73: Add experimental pom.xml files
                                           39830: Resolve CLOUD-423: Concurrent registration / account activations are not handled gracefully
                                           39855: BDE-73 Configure Sonar properly + filter a few failing tests
                                           39877: CLOUD-438: Merged V3.4-BUG-FIX to CLOUD1
                                                36446: Fix for ALF-13404 - Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                                                 - Effectively removed all PATH based queries using the pattern /companyhome/sites/*/container//* as they are a non-optimized case
                                                 - Replaced the "all sites" doclist query using the above pattern with /companyhome/sites//* plus post query resultset processing based on documentLibrary container matching regex
                                                 - Optimized favorite document query to remove need for a PATH
                                                 - Optimized Content I'm Editing discussion PATH query to use /*/* instead of /*//*
                                                 - Fixed issue where Content I'm Editing discussion results would not always show the root topics that a user has edited
                                                 - Added some addition doclist.get.js query scriptlogger debugging output
                                                36449: ALF-13404 - Fix for issue where favoriates for all sites would be shown in each site document library in the My Favorites filter.
                                                37190: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
                                                   37189: ALF-13404: Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                                                      - Additional query improvement by Pavel
                                                37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23
                                           39878: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                                                39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
                                           39919: Added additional configurable datasource that is used by activiti IdGenerator to fetch new block of ID's. Can be defined using JNDI-lookup, reverts to default datasource based on well-know alfresco-properties.
                                           39925: CLOUD-422: Reverted revision 39919, will be re-comitted after CLOUD1 released
                                           39954: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                39655: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39490: Changing the icon for creating a new folder in the cloud
                                                     39580: CloudSync: fix Unsync - to ensure we don't leave sync aspects (such as failed, which reappears if src file is re-synced)
                                                     39587: ALF-15222: Cloud Folder picker: Newly created folder isn't selected
                                                     39589: ALF-15098: Folder Picker causes JS error in the document details page
                                                     39597: CloudSync: tweak a couple of unit tests
                                                     39598: CloudSync: ALF-14655 - update simple file sync (to test multiple sync'd files)
                                                     39606: CloudSync: minor log level adjustments
                                                     39607: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be pushed in parallel
                                                     39613: Refactor of test code. SyncTrackerComponentTest now uses JUnit Rules to manage temporary content and to undo mocking out of services.
                                                     39616: CloudSync: CloudSync: ALF-14483 - SyncTracker - multiple syncs (to different tgt folders) with multiple files
                                                     39633: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be processed in parallel
                                           39955: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                39656: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39640: ALF-15231 Restore, with refactorings / making more general, the ability to lazy create the remote credentials container if bootstrap has not created it (eg on Cloud)
                                                     39641: ALF-15230 Refactor the lazy container creation code, to use the new SystemNodeUtils helper
                                                     39643: ALF-15220: Indirect sync and sync failed indicators appeared together on nodes during the demo
                                                     39653: ALF-15041: Cloud Sync doesn't work with IE7
                                           39956: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                39736: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39735: CloudSync: ALF-14483 - multi-threaded SyncTracker
                                                39866: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39670: Rework to cloud key license stuff - introduces a ValidLicenseEvent
                                                     39673: New unit test for adding checked out nodes into a sync set.
                                                     39677: ALF-14903 Move the Sync allowed/not-allowed check, based on Network/Tenant, to AbstractCloudSyncAbstractWebScript, and have this used by the webscripts based on this too. Then, allow UnSync to proceed no matter what the tenant status, and add unit tests
                                                     39683: ALF-15162 - Unclear error message when delta syncing and the target is gone
                                                     39686: Replaced GPL license with enterprise licence.
                                                     39687: Enterprise license for enterprise remote api project
                                                39867: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39747: ALF-14377	Need to decide what to do when SSD creator user is no longer valid 
                                                          - part 1 nodes are marked.
                                                     39748: CloudSync: fix compile error
                                                     39767: CloudSync: fix ALF-15145 - Unsync of a folder (sync) that has a working copy file causes indirect icon to remain ...
                                                     39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
                                                     39810: ALF-15221: Cloud Sync Status: Failure message when getting location is misleading
                                                     39812: UI Bug Fixes:
                                                          - ALF-15174: Uses already copied slingshot.properties file for message strings needed in both repo and Share
                                                          - Cloud delete file message shouldn't refer to the cloud
                                                     39820: ALF-15267: Edit online is available for locked on-premise copy 
                                                     39826: ALF-14377 - Need to decide what to do when SSD creator user is no longer valid
                                                39870: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39847: ALF-15185: YUI Overlay Mozilla Scrollbar fix should be prevented in recent versions of Firefox too.
                                                     39859: ALF-15249 Add a new method hasSyncSetDefintions, with unit test, and use this to skip the Sync Pull step on-premise if no SSDs have been defined on the local system
                                                     39860: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes.
                                                39914: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39863: ALF-15268: Cancel button disabled in the target selection window for new folder creation in Cloud
                                                     39864: ALF-15003 Sync failed for the file (where write access on source removed for sync owner) but no matter this file appears in Cloud
                                                     39876: ALF-15301: IE8 specific: It is impossible creating a new folder in a cloud target selection window/Cloud location
                                                     39883: CloudSync: fix ALF-15270 - moving directly synced node (on source) causes target node to be deleted
                                                     39902: ALF-15041: Cloud Sync doesn't work with IE7
                                                     39903: ALF-15041: Cloud Sync doesn't work with IE7
                                                     39904: ALF-15041: Cloud Sync doesn't work with IE7
                                                39920: Bug fixing for CSS issues
                                           39959: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                39951: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39915: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes
                                                     39924: CSS fixes for the sync panel
                                                     39942: ALF-14911 - Path shown in the version comments does not match the path shown in the sync status dialogue
                                                          - first part share paths are now handled separatly
                                                     39943: CloudSync: fix remainder of ALF-15130 - sync time for initial sync of working copy (+ unit test)
                                                39952: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     38871: (RECORD ONLY) Adds edition check before calling enterprise only webscript. Sets sync to OFF for non enterprise editions.
                                                     38956: (RECORD ONLY) Chinese Translation for 4.1
                                                     39011: (RECORD ONLY) ALF-14225: Refactor Welcome Dashlet to show 4 columns, the 4th one of which is always the cloud sign up text.
                                                     39024: (RECORD ONLY) ALF-14225: Adds tracking to URL.
                                                39958: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39957: CloudSync: minor - some info logging (applies to src + tgt)
                                           39967: CLOUD-165: Merged 4.1-BUG-FIX to CLOUD1
                                                39962: ALF-15158: Downloading Office 97 files with .doc extension result in file with .dot extension when using Google Chrome
                                                  - Added more complete and intelligent content disposition header with the aim of supporting  RFC 5987
                                           39977: CLOUD-454 - merge asynchronous dashlet improvements and remove inappropriate sections.
                                           40048: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                                                40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval (CLOUD-467)
                                                40047: Fix from Mike Hatfield for ALF-15372 - Chrome is blocking google map display for geo tagged pictures (CLOUD-468)
                                           40078: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                note: "blending" cloud sync fixes into CLOUD1 (as requested by BR)
                                                39997: ALF-14377: Need to decide what to do when SSD creator user is no longer valid
                                                40013: "Cloud Sync" link should not be shown in "My Profile" in the Cloud
                                                40056: Merged the sync specific changes to the other presentation.css files
                                                40070: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: (record-only: NB - already manually merged)
                                                      39566: Allow the sync mode to be fetched by guest (it need not be hidden) ...
                                                      39574: Cloud lacks a guest mode, so switch to unauthenticated for the sync mode fetch (user credentials may not be available)
                                                40071: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39996: ALF-14377: Need to decide what to do when SSD creator user is no longer valid
                                                     40010: Enhancement to TemporaryNodes JUnit @Rule so that it gracefully handles checked-out nodes during test code.
                                                     40017: During work for ALF-15296, I've fixed up the error handling during sync set creation.
                                                     40019: Having fixed the TemporaryNodes @Rule in rev 40010 so that it handles checked-out test files gracefully, I'm removing Jan's workaround for a checked-out test file.
                                                     40036: Addressing the important question raised in ALF-14950.
                                                     40054: CloudSync: add simple *folder* sync unit test !
                                                     40065: Removal of potential NullPointerException (not observed).
                                                     40067: CloudSync: ALF-15287 - folder sync to a clashing name hierarchy causes file to be indirectly synced to the wrong place
                                                     40068: Java doc corrections.
                                                     40069: ALF-15364: CloudSync: folder sync with lock on-premise - pulled new file is not auto-locked
                                           40104: Fix for CLOUD-476 - userStatusRelativeTime is still referenced in org/alfresco/components/dashlets/my-profile.get.js and causes exception on user profile page when user status has been set.
                                           40147: French: Cloud Translation update from Gloria (based on EN rev38372)
                                           40173: Merged V4.1-BUG-FIX to CLOUD1
                                                38178: ALF-14720: Get rid of big, unused class
                                           40174: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                40092: Changing the color of the "Synced Folder" link for each theme
                                                40094: Property translation problem fixed: If there is a replacement parameter (e.g. {0}) and an apostrophe in a property the apostrophe needs to be escaped by using a double apostrophe otherwise the property cannot be translated correctly.
                                                40172: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     40072: Error message string updates, based on feedback from Docs.
                                                     40076: Fixes encoding error introduced in r40072.
                                                     40169: CloudSync: fix ALF-15380 - source file is deleted (or unsync with delete) but an unpulled target update causes target to remain synced (and/or not deleted)
                                           40343: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                40333: Probable fix for ALF-15430. sys:hidden aspect needs to be handled consistently by Hybrid Sync.
                                           40363: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                40356: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     40176: CloudSync: add simple rename test (file + folder sync)
                                                     40282: CloudSync: ALF-15468 - Can't create cloud sync connection from Enterprise 4.1 to Alfresco "in the cloud" !
                                                     40328: CloudSync: minor - unit test updates (for simple move of directly synced nodes - file or folder)
                                                     40333: Probable fix for ALF-15430. sys:hidden aspect needs to be handled consistently by Hybrid Sync.
                                                     40334: Removing unused import - also want to trigger rebuild on this plan as I suspect it failed randomly.
                                                     40349: CloudSync: fix move out (=> target delete) - add unit tests ( ALF-14655 / ALF-15011 )
                                           40402: Fix to CSS error in cloudsync merge - incorrectly overridden font-size in H3 dashlet contents (fix from Mr "I read CSS in my sleep" Hatfield).
                                           40421: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                40419: Fix for the MLText parts of ALF-15502.
                                 44550: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      40565: CLOUD-23: core changes to allow overriding of "edit online" button's URL generation.
                                      40566: CLOUD-23: override "edit online" button's URL generation to work with cloud format SPP URLs.
                                      40628: Cloud SPP: stop SOAP/RPC requests being rejected when URL is outside of doclib.
                                      40653: CLOUD-26: 4.1 All protocol features outside browsing the document library should be disabled
                                      40667: CLOUD-26: core change to support both Thor and standard URL schemes.
                                      40668: CLOUD-26: fix Document Management sidebar before disabling unwanted features.
                                      40670: CLOUD-26: fixing "add new members..." to work with cloud (before disabling feature!)
                                      40677: Cloud SPP: fix disallowing of unsafe methods outside of doclib, fixed to allow all methods to Sharpoint protocol methods and fixed tests.
                                      40683: CLOUD-26: core changes to allow easy overriding of dwsServiceHandler bean without having to respecify configuration settings.
                                      40686: CLOUD-26: disable Members tab in Document Management sidebar of Office 2007.
                                      40693: CLOUD-26: disable Links tab of the Document Management sidebar in Office 2007.
                                      40814: Cloud SPP: users were unable to list/edit files within their non-home tenant.
                                      40846: CLOUD-28: made activity "appTool" parameter a configurable value.
                                 44551: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      40861: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           40854: ALF-15557: Sharepoint subsystem to create activity records
                                      40863: Cloud SPP: Removed activity posting code made redundant by commit 40861
                                      41037: CLOUD-23: SPP can be deployed to the root context, i.e. "/"
                                      41079: CLOUD-26: core SPP changes to allow overriding of behaviour.
                                      41080: CLOUD-26: disable "documents" tab in document management sidebar of Office 2007.
                                 44552: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      41102: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           40553: Remove on-premise style MT store Id extraction code from syncmode config lookup.
                                      41103: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           40783: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
                                      41106: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           40871: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                40342: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                                                     35747: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                          34235: Upgraded Jackson to 1.9.4
                                                          34258: Removed invalid bean definitions (classes don't exist) for abstract="true" beans.
                                                          34463: Exported=true 
                                                          34464: Removed unused parent workflow
                                                          34465: Added a createComment method (Just cut and pasted Neils testcase code).
                                                          34466: Initial check-in of Rest Api code.  Still quite a bit to do.
                                                          34619: Added sources
                                                          34620: Going to start another Sprint so I need to check in everything up to date. WIP
                                                          34691: Renamed Action interfaces for better consistency, Fixed up POST methods with better Metadata about resources and fixed failing tests
                                                          34727: Reworked the Resource execution, added PUT webscript, improved the tests.
                                                          34853: Implemented HTTP Methods: GET, PUT, POST, DELETE with better test cases
                                                          34856: Initial cut of rest api implementations. Work in progress.
                                                          34935: Added EmbeddedEntityResource and uniqueid annotations. Recursively calls embedded entities, improved tests.
                                                          34956: Attempted simplification by removing the CollectionResource concept -> Just an EntityResource with 5 potential methods.
                                                          34986: 2nd cut of rest api implementations: still wip.
                                                          34987: Added a readById method for Resource GET using the relationship id
                                                          35007: Rest API (THOR-1150, THOR-1151, THOR-1152, THOR-1153, THOR-1220, ):
                                                              - explicitly set default timezone for date serialization/deserialization to UTC
                                                              - more rest api implementation tests
                                                              - rest api implementation re-factoring resulting from changes to the framework
                                                          35024: Automatically sets the id of passedIn object for a HTTP PUT for relationship resources.
                                                          35051: Further impl for public api: THOR-1150 -> THOR-1153 and THOR-1220
                                                          35059: Separated the GET executor so the embedded objects are called correctly.
                                                          35102: Added Paging, fixed up the Tests.
                                                          35117: wip, rest api implementations
                                                          35312: Made final
                                                          35313: Better exception handling with messages
                                                          35314: Improved paging/params and messages, started on embedded relations
                                                          35322: Added support for relations projections, to filter by properties use "properties" param, to add in relations use the "relations" param
                                                          35329: Handles null relationship keys
                                                          35377: Checks for simple property types which don't allow embedding
                                                          35496: WIP: rest implementations, test framework and tests
                                                          35529: Initial commit of scope and versioning support.
                                                          35539: Fixed the versioning for relationship resources
                                                          35560: Quick cleanup
                                                          35562: Embedded relationships is now working much better
                                                          35586: Safer serialization of Maps/Collections
                                                          35603: Added better version and filtering tests.
                                                          35611: Added Entity and Relationship not found exceptions
                                                          35612: Added Entity and Relationship not found exceptions
                                                          35674: Rest api implementations:
                                                               - node refs are represented solely by their uuid (workspace://SpacesStore is assumed)
                                                               - updates to model classes (hashcodes, equals, etc)
                                                               - more paging support
                                                               - tests
                                                     35858: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                          35773: Added api versioning with @WebApiDeleted annotation.  Better inheritance handling and improved tests.
                                                          35774: Deleted, it wasn't supposed to be there.
                                                     35988: WIP:
                                                         - sample requests
                                                         - more tests
                                                         - general fixes, including security fixes
                                                         - tag entity
                                                     35990: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                          35938: Reworked filtering in a big way. Hopefully now it works.
                                                          35982: Clean up and bug fix the request
                                                          35983: Clean up and bug fix the request
                                                     36002: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                          35992: Clean up after discussions with David/Steve. New Parameter called "parameters"! 
                                                     36056: Clean up, not used
                                                     36057: Changed the way responses are rendered, more consistent "entry" entries.
                                                     36087: Changed the json structure for tests as well
                                                     36134: Added paging parameter, cleaned up imports, more tests
                                                     36146: WIP:
                                                          - fixed up create tag return type
                                                          - fixed up Person model entity so that it doesn't extend Node
                                                     36151: Fix for Serialization of recursive related Collection of results
                                                     36168: Better empty collection handling, initial sorting tests.
                                                     36189: Fixes embedded resources by correct id.
                                                     36210: WIP:
                                                          - updates to rest api request files
                                                          - changed Comment so that it doesn't extend Node. removed title
                                                          - more tests
                                                     36211: WIP:
                                                          - service paging and other fixes and updates
                                                     36298: Moved jetty files to fix the build (it's odd that cloud -r works and yet continuous.xml does not)
                                                     36299: Update classpath as a result of jetty jars move
                                                     36301: Fix to stop null values in hashmaps from being returned in results.
                                                     36302: Added copyright notices
                                                     36303: WIP:
                                                          - split site service into a base class (dealing with site permissions and membership) and a subclass (everything else) to aid the following
                                                          - moved site membership functionality into canned queries for person sites and site members relations
                                                          - changed totalItems to an Integer so that it can be null if total items is not known
                                                          - added siteId filtering for activities
                                                          - copyright notices
                                                          - creating a comment through the comment service raises a share-like activity
                                                     36304: WIP:
                                                          - changed totalItems to an Integer so that it can be null if total items is not known
                                                          - copyright notices
                                                     36309: Servlet API 2.5 needs to be included at the top for the embedded jetty to work - need to revisit this.
                                                     36310: Temporary fix for dealing with nodeRefs embedded in activity summaries: regex match and convert to NodeRef.
                                                     36312: Fix tests
                                                     36325: Add jetty jars to ant test classpath
                                                     36327: Site memberships fix, override search subsystem to force lucene, re-instate full site service implementation (Spring circular dependencies are ok)
                                                     36335: Add missing file
                                                     36367: Fixes to tests
                                                     36368: CommentService fix - permissions.
                                                     36438: WIP:
                                                         - Person filtering (for cloud)
                                                         - Disabled some tests that are preventing the test from running (will revisit)
                                                         - Person-avatar relation
                                                     36522: WIP:
                                                         - fix sort ordering for site members
                                                         - fix site id filter for activity feed list (add tenant id)
                                                     36523: WIP:
                                                         - more tests
                                                         - improved robustness of tests
                                                         - added status mappings for EntityNotFound and RelationResourceEntityNotFound
                                                         - for avatar, return base 64 encoded avatar data and avatar node id
                                                         - use more specific EntityNotFound and RelationResourceEntityNotFound exceptions.
                                                     36646: Changes resulting from review
                                                          - make sure empty strings and null values are not output
                                                          - person entity tidy-up
                                                          - person visibility rules applied to person retrieval
                                                          - more tests
                                                          - return noderef of avatar node
                                                     36668: Fix build, add missing file
                                                     36694: Fix failing test
                                                     36764: WIP:
                                                          - site containers canned query
                                                          - node ratings: return null average (rather than -1) if there are no ratings
                                                          - site membership canned query sorting - use an enum for sort fields
                                                     36767: Add missing files
                                                     36769: WIP:
                                                          - node ratings: remove user rating summary, added rating date and fixed up tests
                                                     36770: WIP:
                                                          - some changes to property names for activity feed entries
                                                     36823: WIP:
                                                         - re-instate -1 for average rating when there are no ratings
                                                     36824: Changes resulting from review:
                                                         - merge activities into one relation
                                                         - quota model object to model network quotas
                                                         - Change HomeAccount -> HomeNetwork
                                                         - Changes to comment property names
                                                         - If average rating is -1 (from the rating service) convert to null
                                                         - remove readById from node entity resource
                                                         - Favourite sites url renaming
                                                     36825: Removed debug logging for rest api
                                                     36826: Commented out tag related tests until I figure out how to get the lucene search working
                                                     36833: Added discoverablity for the documentation.  New @WebApiDescription, @WebApiParam annotations
                                                     36871: Added tests for @WebApiDecrition, @WebApiParam
                                                     37026: WIP:
                                                          - added discoverability annotations
                                                          - changes resulting from review:
                                                             o node ratings output restructure
                                                             o network quotas restructure (need to revisit this again)
                                                          - activity summary post processing framework
                                                          - added non-caching to rest api webscript (need to revisit)
                                                          - don't output empty strings (need to revisit)
                                                          - more tests
                                                     37058: WIP:
                                                         - change tag service support
                                                     37141: WIP:
                                                          - tag sorting
                                                          - fix JSON issue in PreferencesService
                                                     37142: WIP:
                                                          - refactoring: split functional areas into separate REST API implementation classes
                                                          - added copyright notices
                                                          - network quotas represented as a list
                                                          - ensure empty (zero length) JSON strings coming into the REST api are treated as null
                                                     37300: WIP:
                                                          - support for update comment
                                                          - activity summary processing
                                                          - web script set no caching and response content type
                                                     37301: WIP:
                                                          - support for update comment
                                                     37354: Build fix: try rebuilding indexes
                                                     37369: Fix build: try again
                                                     37498: More logging to determine build failure using lucene for search
                                                     37608: Build fix?
                                                     37609: Fix build
                                                     37637: Fix build: try again
                                                     37672: Build fix (try again)
                                                     37860: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                                                     37861: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                                                     37862: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                     37864: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     37866: Unit test fix
                                                     37950: Build fix for ApiTest (another try - override repository-properties bean to force lucene)
                                                     38051: Build/test fix (another try)
                                                     38072: Removed file no longer required
                                                     38114: Better representation of the Resource metadata.  Try calling: /alfresco/service/public/alfresco/versions/1
                                                     38230: Fix PublicApiTest on the build machine
                                                     38309: Public api test fixes
                                                     38319: Public api webscript transaction configuration. Make get webscript r/o transaction.
                                                     38320: Public rest api: make sure http response headers are written before the response content.
                                                     38340: More build test fixes
                                                     38349: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                         - fix up CMIS query fallout
                                                     38530: Fix tests
                                                     38531: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                          - fix up cmis queries
                                                     38552: Further test fixes
                                                     38574: Added some comments
                                                     38730: Added OPTIONS webscript to get metadata on the current url
                                                     38879: Refactored a little to make the code easier to extend / customise
                                                     38880: Fixed incorrect config, I should try not to delete things.
                                                     38986: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                                                          38954: Fix for ALF-14475: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                                                     39010: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                                                          39006: Fix for ALF-14475 part 2: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                                                     39090: Fixed broken webscript OPTIONS call
                                                     39159: Fix broken INFO url mapping
                                                     39326: Clean up, Added ResourceMetaDataWriter interface for different meta info presentation formats
                                                     39331: The tests need their own context
                                                     39609: Update to latest Chemistry libraries
                                                     39657: Fix for CLOUD-417, part 1: "Delete a Comment"
                                                     39741: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                     39742: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                     39750: Fix for CLOUD-417, part 2: "Delete a Comment"
                                                         - added delete comment method to comment service
                                                     39754: Fix for CLOUD-417, part 3: "Delete a Comment"
                                                         - fixed up activity generation for update and delete comment
                                                     39776: OpenCMIS TCK fix: getDescendants is using node service, which unlike the FileFolderService does not automatically remove hidden files.
                                                     39780: Shifted public api opencmis webscript definitions to Thor
                                                     39781: Shifted public api opencmis webscript definitions to Thor
                                                     39782: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                     39783: Minor fixes, comments
                                                     39785: Public api tests
                                                         - move jetty libraries to 3rd party
                                                         - remove JettyComponent as a Spring bean and change how it's constructed
                                                     39786: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                         - for unversioned documents, the revision number should not be appended
                                                     39794: Added missing files for public api tests
                                                     39795: Update to latest Chemistry libraries
                                                     39834: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                         - for unversioned documents (or documents with version "1.0"), the revision number should not be appended
                                                     39835: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                                                     39836: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                     39844: Public api tests
                                                         - move jetty libraries to 3rd party
                                                         - remove JettyComponent as a Spring bean and change how it's constructed
                                                     39854: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                                                     39856: Re-instate tests.
                                                     39857: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - removed cmisatom url binding (opencmis is now at .../public/cmis/versions/1/atom)
                                                     39926: Fix for CLOUD-442: "Public API : Tagging + Paging"
                                                     39927: Fix for CLOUD-442: "Public API : Tagging + Paging"
                                                          - updates to public api tests
                                                     40185: Make sure LockService is injected into CommentService
                                                     40186: Make sure LockService is injected into CommentService
                                                     40187: Changes resulting from sprint demo:
                                                         - changes to network and network membership representation
                                                         - embed modifiedBy person object in comment
                                                     40211: Changes resulting from sprint demo:
                                                         - changes to network and network membership representation
                                                     40212: Fix intermittently failing test
                                                     40223: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                          - removed browser binding for now
                                                     40224: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" (Thor-specific changes)
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                          - removed browser binding for now
                                                     40225: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                          - removed browser binding for now
                                                     40254: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     40255: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     40256: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     40270: Turned stacktrace into a String
                                                     40339: CLOUD-488: "The activities feed in the public API is not returning all required summary data for comments"
                                                40548: Merged PATCHES/V4.0.2 to BRANCHES/DEV/THOR1_REST_API2:
                                                     40526: Fixed ALF-15540: CMIS: Synchronized block in service interceptor
                                                40644: Public api:
                                                40645: Public Api:
                                                40646: Public Api:
                                                40649: Public api:
                                                40650: Public api:
                                                40657: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                                                     40515: CLOUD-390: Content models to be filtered out of Cloud CMIS implementation
                                                     40550: Public api:
                                                         - updates to datetime property names
                                                     40552: Public api:
                                                          - sort sites by site title (by default)
                                                     40596: Removed "system" from exclusions for CLOUD-495
                                                     40610: CLOUD-495: F414: Add multiple tags to a folder or document
                                                40674: Public api:
                                                40675: THOR-1324: "F414: Add multiple tags to a folder or document"
                                                40676: Public api:
                                                40678: Public api:
                                                40715: Public api:
                                                40730: Merged /alfresco/BRANCHES/DEV/THOR1_REST_API1:r40724  Better meta-data handling for PUT requests
                                                40731: Merged /alfresco/BRANCHES/DEV/AMILLER/CLOUD-496:r40659: CLOUD-500: Add trusted auth with key validation.
                                                40732: Fixed failing test
                                                40739: Merged BRANCHES/DEV/V3.4-BUG-FIX:r40193: ALF-15307 / ALF-15190: FTS indexing can stick forever on purged nodes - May cut 50 minutes off the build time when merged
                                                40742: Public api
                                                40801: Public api:
                                                40802: Public api
                                                40803: Public api
                                                40804: Public api
                                                40807: Public api
                                                40811: Public api
                                                40815: Public api:
                                                40826: Public api
                                      41108: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           40898: Fix build
                                      41110: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           40903: Fixed solrcore properties (merge error)
                                      41111: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41007: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                40998: CLOUD-563: "View external member of the site if internal user is not a member of a site."
                                      41112: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41048: Merged DEV/V4.1-BUG-FIX to DEV/CLOUD1
                                                 40382: Fix for ALF-15491 SOLR is generating queries for lucene style cross-language support
                                                 40632: Fix for ALF-15487 Search not working for queries containing 3-digit versions
                                                        Fix for ALF-15356 SOLR doesn't support searching by cm:name of file with underscore and dots
                                                 40662: Eclipse classpath fixes
                                                 41032: Fix for ALF-15753	Infinite loop during Solr ACL indexing when ACL Changeset batch is empty
                                      41245: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41128: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41126: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     40364: Testcase for ALF-15178, which is not reproduced.
                                                     40419: Fix for the MLText parts of ALF-15502.
                                                     40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
                                                41127: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     41121: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                                                          41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                          41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                          41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                          41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                     41123: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                                                          41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                      41247: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41149: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41146: Fix trusted authentication against OpenCMIS
                                      41248: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41157: BDE-73: finish adding all the code into Sonar report. Tests are not there yet.
                                      41249: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41180: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                40482: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
                                                   - ALF-15453: Incorrect manage permissions working for a file/folder   
                                                Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                   40486: ALF-15453: Incorrect manage permissions working for a file/folder
                                      41250: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41185: BDE-73: Add back web-framework-commons to fix reporting
                                      41251: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41192: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                      41252: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41209: BDE-73: workaround MDEP-98 encountered with Sonar
                                      41253: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41212: CLOUD-610: "Public APIs causing problem with mobile app"
                                 44553: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      41293: Cloud SPP only: fix IDE project dependency and classpath for PublicApiTest (and others no doubt) to run.
                                      41294: Cloud SPP: ensure vti and thor module dependency is handled correctly.
                                      41312: Fix build problem: some unit tests had been split out and needed the sharepoint module on the classpath.
                                      41379: Cloud SPP: remove remote-api dependency from repository.
                                 44554: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      41695: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41114: Merged DEV\V4.1-BUG-FIX to DEV\CLOUD1
                                                 40977: (Record only) Sync parser generation
                                      41696: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41302: CLOUD-622: "Mobile App connection to testmy build 227 issue"
                                      41698: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41375: BDE-73: remove never-ending test for reporting
                                      41699: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41377: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                40859: public api:
                                                40862: CLOUD-555: "Updating comment fails because node not found"
                                                40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                                40979: Added tests for non-numeric params and non-european characters
                                                41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                                     41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                                41097: Added quickshare and cloudsync to cmis filter list
                                                41098: Renamed serializer/deserializer lists for RestJsonModule
                                                41099: Cleaned up consistent Rest responses - CLOUD-574
                                                41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                                41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                                41105: Added key for trusted layer7 relationship
                                                41137: Public api:
                                                41168: Public apI;
                                                41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                                41170: public api:
                                                41171: public api:
                                                41172: public api:
                                                41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                                41186: Fix solrcore properties
                                                41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                                41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                                41325: Public api:
                                                41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                                41369: Public api:
                                      41700: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41474: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41422: Sample OAuth call for the Resource Owner Password flow
                                                41427: Sample OAuth call for the Client Credentials flow
                                                41433: Public api: (1) parameterize site members/people sorting in service api
                                                41434: Public api: minor comment service fix
                                                41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41439: Public api: fix for default tenant id in CMIS requests
                                                41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                                41457: Fix build
                                                41461: Public api: more tests
                                      41701: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41560: CLOUD-657: "cmis root service document returning incorrect urls"
                                      41702: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41627: CLOUD-676: "OpenCMIS Returns Error 500 on GET: https://testp.alfresco.me/alfresco/a/cmis/versions/1.0/atom"
                                      41703: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41670: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                                41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                                41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                                41628: Public api: more tests
                                 44555: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      41709: CLOUD-640: Notification is not displayed for consumer for updating/editing document added by other user
                                      42331: Cloud SPP: really fix import order.
                                      42364: Cloud SPP: fix Spring bean filename typo.
                                      43078: CLOUD-868: incorrect URL for Sharepoint protocol
                                      43153: CLOUD-747: SPP: Checking document out doesn't work
                                      43221: CLOUD-896: Unable to open specific version of document from MS Word
                                      43222: CLOUD-896: Unable to open specific version of document from MS Word
                                      43247: CLOUD-896: missing class CloudVersionsServiceHandler from previous commit.
                                      43256: CLOUD-896: fix broken test
                                 44556: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      43472: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41710: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41672: CLOUD-672: "404 Error when browsing child files/folder "
                                                41673: Public api: more tests
                                                41675: CLOUD-674: "Root network calls need to return application/json content type"
                                           41754: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                                41677: No-op skeletons of Public API gateway filter and URL rewrite filter
                                                41683: Url rewrite rules for new and old-style public api
                                                41705: First working version of gateway filter
                                                41732: Trim authenticator keys from config
                                                41734: Productising code - tests and bug fixing with layer7, code tidyup, configuration, error handling
                                                41753: SSL support for accepting self-signed certificates
                                           41794: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                                41792: Fixes for Gateway authentication filter after end to end testing on staging.
                                           41798: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                                41797: Ensure authentication filter provides enough info to gateway for full analytics
                                           41815: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                                41814: Fix regression where old style apigee route failed
                                           41842: CLOUD-619: "CMIS query for objectId throws exception"
                                           41843: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41823: Public api: more tests
                                                41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                           41855: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                           42005: Merged BRANCHES/DEV/FEATURES/CLOUD1_DAM to BRANCHES/DEV/CLOUD1:
                                                37644: Resolve CLOUD-34: Incorporate Gallery View
                                                39105: Moved to AMP produced from modules/dam/BRANCHES/V1.0 with overrideSource=cloud build property
                                                39268: ALF-13984: High Resolution Mime-Aware Place Holder Icons
                                                     - Implemented in DAM 1.0.2.0
                                                39651: Deployed DAM module version 1.0.3 to CLOUD1_DAM which fixes:
                                                     - CLOUD-380: Document library displayed incorrectly in Gallery view in IE7
                                                     - DAM-36: CLONE - Document library displayed incorrectly in Gallery view in IE7
                                                     - DAM-37: Gallery View: No Border Around Selected Items in IE7
                                                     - DAM-38: Gallery View: Two Items Must be Selected in IE7 for Multi-select Actions
                                                     - DAM-39: Gallery View: Slider Behavior is Erratic in IE7
                                                     - DAM-40: Gallery View: Upload Instructions Throws Error in IE7
                                                40083: CLOUD-378: Drag and drop within document library doesn't work in Gallery view
                                                     - Deployed DAM 1.0.4.0
                                                40507: Changed name of DAM module to Media Management
                                                40534: Version 1.0.5.1 of MM module which includes:
                                                     - DAM-61: Multi-Select Checkboxes Are No Longer Present in 1.0.5
                                                40723: Deployed version 1.0.5.3 of the Media Management module which includes fixes for:
                                                     - CLOUD-544 / DAM-66: 'Share' Link Displayed Incorrectly on Info Panel
                                                     - CLOUD-543 / DAM-65: Gallery View Content Display Should Support Dynamic Changing of Browser Width
                                                41174: Deployed Media Management module 1.0.5.4 which includes:
                                                     - DAM-67: Gallery View Changes the Size of Dragging Thumbnails in Other Views
                                                     - DAM-68: Gallery VIew Should Hide Its Container on destroyView
                                                     - DAM-69: Gallery View Resizing Should Fire Only When Resizing has Stopped
                                                     - DAM-71: Gallery View Thumbnail Generation Should Accept Thumbnail Definition Parameter
                                                41536: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                     40870: m.share fixes
                                                41537: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                     40919: m.share fixes
                                                41538: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                     41432: Fixed CLOUD-587 "Drag and Drop Changes Conflict with Hover Events on Touch Devices"
                                                41614: Changed version of gallery view only MM module to 0.1
                                                42004: Upgraded to MM 0.1.5.5 which contains fix for DAM-74
                                           42047: Merged DEV/CLOUD_SIGN_UP into DEV/CLOUD1 (cloud priority 
                                           42049: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1:
                                               41674: ALF-15967: Using START_USER_ID_ instead of "initiator" property to query process instances started by user X to prevent extra joins + removed unused constants
                                               41650: Fixed CLOUD-667: Merged fix for ALF-14438 into CLOUD1-BUG-FIX + using START_USER_ID_ instead of custom "initiator" property to query initiator to boost performance even more
                                           42050: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1:
                                               41674: ALF-15967: Using START_USER_ID_ instead of "initiator" property to query process instances started by user X to prevent extra joins + removed unused constants
                                               41650: Fixed CLOUD-667: Merged fix for ALF-14438 into CLOUD1-BUG-FIX + using START_USER_ID_ instead of custom "initiator" property to query initiator to boost performance even more
                                           42121: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                                                39663: CLOUD-153 - Invite box doesn't parse email addresses properly
                                           42160: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                                                38864: CLOUD-41 - Resize logo banner on upload
                                                38878: CLLOUD-42 - Image previews should be larger
                                           42199: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                                41113: Creating new [bug fix] branch from BRANCHES/DEV/CLOUD1
                                                41211: QuickShare: CLOUD-593: prevent copying of QuickShare props on node copy [+ minor refactor]
                                                41612: QuickShare: Merged form THOR1_QUICK_SHARE to CLOUD1-BUG-FIX
                                                   36363: QuickShare: Improvment for THOR-1268 "F378: As a user I can choose to share a document"
                                                41639: QuickShare: Fixed bug where the display of quickshare was based on the showComments property
                                           42200: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
                                           42201: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
                                           42203: CLOUD-71: Patch was there, but reference to it from "postUpgrade..." was lost in merge, preventing it from being executed
                                           42204: Merged BRANCHES/DEV/HEAD_QUICK_SHARE_TMP to BRANCHES/DEV/CLOUD1:
                                                41733: QuickShare: fix ShareContentGet NPE (fix for Document Details redirect if logged in)
                                           42206: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                                41213: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource
                                                41214: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource (DO NOT MERGE to Enterprise/HEAD)
                                                41270: CLOUD-452 / ALF-15823: reconfigure Activities DAOs to use common Alfresco datasource
                                           42209: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                                41292: CLOUD-520: Convert TicketCleanupJob to a StatfulJob
                                                41410: CLOUD-119: Change status code to 409 (Conflict), from 400 (Bad Request), when parent folder does not exist
                                           42211: Fix pesky solrcore.properties ... remove hardcoded amiller ;-)
                                           42231: CLOID-71: TEMP - comment-out previous r42203 (breaks build/tests)
                                           42241: Updated Media Management module to 0.1.5.6 which contains fixes for:
                                                - CLOUD-740/MM-76: Empty space in the page footer when switching to Gallery View
                                                - CLOUD-741/MM-75: IE7: Opacity of Folder Icon not Rendered Correctly in Gallery View
                                                - CLOUD-741/MM-77: Gallery View Continually Recalculates Height in IE
                                                - CLOUD-753/MM-78: Links for 'Create a folder' and 'Upload files' in the Empty Folder Instructions Don't Work in Gallery View
                                                - MM-79: Disable Fade Animation on Resize of Gallery View
                                           42252: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                                                 42233: Fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
                                                        and related CLOUD-760 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
                                           42267: CLOUD-153: Update CloudInvitationServiceImpl to only use the address part of an email string and ignore the personal name. 
                                           42285: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41867: CLOUD-711: "It should be possible to remove a favourite site"
                                                41957: Public api: - error handling improvements - more tests
                                                41970: Public api: - fix build  (add missing files)
                                                41972: Public api: - more tests (including OpenCMIS TCK)
                                                42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                                42058: Public api: changed logging package name
                                                42124: Public api: - more tests - minor fixes
                                                42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                                42126: Public api: fix up OpenCMIS tests
                                                42171: Consistency fix for CLOUD-695.
                                                42180: Fix build
                                                42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                                42214: Public api tests (cmis)
                                                42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                                42253: Fix build
                                           42288: Fix build - fix merge problem
                                           42302: Updated Media Management module to 0.1.5.7 which contains fixes for:
                                                - CLOUD-788/MM-89: "Rename" Icon is not Displayed Correctly in Gallery View
                                           42320: Fix build (fix dodgy merge)
                                           42334: Fixed build of Media Management module for:
                                                - CLOUD-789/MM-91: MM AMPs Produced No Longer Contain module.properties
                                           42341: Fixed CLOUD-755 "Label needs to be renamed and icon should be present"
                                           42344: Fixed CLOUD-755 "Label needs to be renamed and icon should be present" part 2
                                           42365: CLOUD-153: Fix additional invite paths.
                                           42373: Updated Media Management module to 0.1.5.8 which contains:
                                                - MM-92: Change Default View for Cloud to Detailed Rather than Gallery
                                           42513: CLOUD-808: fixed issue with timers due when alfresco boots
                                           42577: CLOUD-808: Fix for timer deploying MT-process when shared is required caused test to fail
                                           42588: BDE-73: fix compilation + switch to MySQL to make cloud tests pass 
                                           42595: Add salesforce modules to privatemodules.  Contains only models.
                                           42596: Add salesforce module build properites and ant build tasks.
                                           42601: Updated salesforce amp with correct version number and updated module-context.xml
                                           42668: BDE-73 Fix Sonar reporting
                                           42709: FRENCH: Translation updates based on EN r42416
                                           42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch
                                           42871: GERMAN: Cloud Translation, based on r 42416
                                           42879: SPANISH: Cloud Translation, based on r 42416
                                           42890: ITALIAN: Cloud Translation, based on r 42416
                                           43120: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                                                43100: Update the salesforce amp to include the CORS Filter
                                                43101: Update web.xml to enable to the CORS Filter with filter-mapping
                                                43117: Add updated amp with removed CORS Filter.  CORS Filter is now available in 3rd-party libs
                                                43118: [CLOUD-724] Add CORS Filter jar to 3rd-party libs
                                                43119: [CLOUD-724] Add missing jar java-property-utils-1.6.jar to 3rd-party libs
                                           43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers
                                           43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
                                                42257: CLOUD-649: Updates UI action for Granular Permissions
                                                42295: CLOUD-33: Updates labels
                                                42303: CLOUD-651: Limit user search to site members only.
                                                42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
                                                42427: Removes multi-select manage-permissions dialogue.
                                                42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
                                                42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
                                                42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
                                                42807: CLOUD-863: Reordered code to avoid AccessDeniedException
                                                43259: CLOUD-901: Revert showComments check so it handles undefined permission
                                                43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
                                                43307: CLOUD-900: Follow-up fix
                                           43353: Fix for remote transform server with new cloud environment
                                           43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
                                                39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                                                     Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                                                       36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                                                          - Will be revisited to add better comments
                                                       36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                                                          - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                                                          - Better code documentation
                                                          - Removed dev/test code
                                                          - Improved error config handling
                                                       36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                                                          - Changed "link" parameter to "href" (instead of "page") to match actions.
                                                       39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                                                       39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
                                                39875: Configurtion changes to enable Google Docs V2 within the web tier.
                                                39881: It's extension ... not extention
                                                39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
                                                39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
                                                40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
                                                40624: Update Google Docs AMPs
                                                40635: Merge Google Docs Cloud AMPS to Feature Branchs
                                                40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
                                                40897: Google Docs AMP update 
                                                41165: Merge Updated AMPs for [GOOGLEDOCS-83]
                                                41179: Update AMPs for [GOOGLEDOCS-87]
                                                41262: Update AMPs for GOOGLEDOCS-89
                                                41493: Update AMPs for [GOOGLEDOCS-93]
                                                41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
                                                41805: Update AMPs for [GOOGLEDOCS-101]
                                                41840: Add AMPs with i18n strings
                                                43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
                                                43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
                                                43320: Add googledocs repo declaration
                                 44557: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      43751: CLOUD-747: SPP: Checking document out doesn't work
                                      43765: CLOUD-747: fixes ${localname} substitution in vti.server.external.host value
                                      43780: CLOUD-747: Sharepoint version of PROPFIND handler must return 'href' containing the externally visible base URL
                                      43785: CLOUD-747: fix for proxied repository - more robust parsing of URLs.
                                      44001: Fix pesky solrcore properties
                                      44036: Resolve CLOUD-877: UI button for SharePoint Protocol needs to be updated
                                      44211: CLOUD-747: checkout/checkin works for spaces in document
                                 44564: Fix construction of vti activity processor after merge
                                 44565: Remove unnecessary build of war and amps for exploded target (NOTE: may fail in continuous build)
                            44573: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/CLOUD1:
                                 44572: Clean up of unused files.
                            44575: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                                 43592: (RECORD ONLY) Rebase CORS Filter with the latest CLOUD1
                                 43593: (RECORD ONLY) Add CloudTenantWebScriptServlet endpoint /a to CORS filter mapping
                                 43718: (RECORD ONLY) [CLOUD-955] Add new web script tennant service to seperate public api from web script api
                                 43749: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                                 44517: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                            44576: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                                 44518: [CLOUD-955] Change CORS filter-mapping to use servelet instead of url
                       44696: CLOUD-174: Fix typo in sharepoint configuration.
                       44697: CLOUD-174: Fix spring configuration, missed in initial refactoring. 
                       44716: CLOUD-174: Fix test failures
                       44737: CLOUD-174: Remove duplicate property definition
                       44758: CLOUD-174: Add Sync monitros
                       44771: CLOUD-174: Add local node metrics   
                  46143: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45329: FRENCH: Cloud translation updates based on EN r45266
                       45330: GERMAN: Cloud translation updates based on EN r45266
                       45332: SPANISH: Cloud translation updates based on EN r45266
                       45333: JAPANESE: Cloud translation updates based on EN r45266
                       45427: SPANISH: Cloud 1 translation updates based on EN r45266
                       45718: ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import)
                       45838: FRENCH: Cloud Translation update based on EN r45266
                       45853: Merged BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH to BRANCHES/DEV/CLOUD1:
                            44041: Merged BRANCHES/DEV/CLOUD1_SPRINT1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                                 40496: Merged from BRANCHES/DEV/AMILLER/CLOUD1_SPRINT_1 to BRANCHED/DEV/CLOUD1_SPRINT1
                                      CLOUD-189: Created e-mail template macros and css lib files
                                      CLOUD-189: E-mail template image assets
                                      CLOUD-189: Updated macros and CSS lib plus finished site invitation template
                                      CLOUD-189: Reset password e-mails
                                      CLOUD-189: More e-mail templates
                                      CLOUD-189: Workflow template
                                      CLOUD-144: Refactor AbstractUserNotifier to allow custom models to be passed to template.
                                      CLOUD-144: Custom activity feed model builder, for cloud.
                                      CLOUD-144: Activities e-mail template
                                 40958: CLOUD-580: Added alt text for images
                                 40960: CLOUD-585: Added missing quotes to invitation e-mail
                                 40967: CLOUD-144: Add joins aggregation to activites feed model and fix missed merge.
                                 40970: CLOUD-144: Added joins to activities e-mail
                                 40982: CLOUD-582: Fix subject
                                 41028: CLOUD-582: Fix unit test assertion on email subject
                                 41231: CLOUD-612: Add generation time to model.
                                 41276: CLOUD-612: Added date to activity e-mail template
                                 41279: CLOUD-614: Added missing footer text to activities e-mail
                                 41502: CLOUD-611: Remove corner images
                                 41728: CLOUD-681: Add others category to activities e-mail
                                 42138: CLOUD-613: Remove exclusions from site activities, sort grouping by site name and improve logic for determining network.
                                 42196: CLOUD-613: Group activities by site
                                 42914: Translated e-mail templates
                            44174: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                                 43983: GERMAN: Translation updates based on EN r43703
                                 43984: SPANISH: Translation updates based on EN r43703
                                 43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                                 43986: ITALIAN: Translation updates based on EN r43703.
                                 43987: JAPANESE: Translation updates based on EN r43703.
                                 43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                                 44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                                 44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                                 44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                                 44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                                      43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                                 V4.0-BUG_FIX
                                                     36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                                     36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                                     36608: First part of ALF-14209 SOLR - does not support query for all stores
                                                     36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                                     36954: ALF-14209 SOLR - does not support query for all stores
                                                     37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                                     37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                                     37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                     37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                                     37628: Build Fix
                                                     37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                     37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                                     37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                     38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                                     38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                                 V4.1
                                                     38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                                 V4.1-BUG-FIX
                                                     40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                                     41201: Fix for ALF-15767 Group query using cm:authorityName
                                                     41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                                     41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                     41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                     41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                                     41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                                     41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                                     41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                            Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                                     41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                                     41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                            Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                     41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                                     41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                     41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                                     42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                     42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                     42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                           42547: Fix the model used for embedded tests.
                                           42659: Add missing test model
                                           42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                                 42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                                 42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                           42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                                 working copy sync r42514 through r42659
                                      43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                42363: ALF-16213: renaming versioned file results in file being deleted.
                                           42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX:
                                                     42389: CLOUD-796: handle unknown custom content/folder type
                                                     42396: CLOUD-796: handle unknown custom content/folder type
                                                     42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                          41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly
                                                     42406: CLOUD-796: handle unknown custom content/folder type
                                                 42409: CloudSync: CLOUD-796 / ALF-16226 -  hide sync props in forms (eg. edit props) for sync'ed custom content type
                                           42428: ALF-16217: Remove unnecessary restriction on content type
                                           42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                                      43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                           42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                                      43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                                      43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                           42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                           42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                                      43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                                      43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                                      43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                           42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                           42868: Fix failing build tests + further/revised public api tests
                                           42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                           42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                           42899: Fix build
                                      43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                                      43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                           43234: CLOUD-313: Implment Transport pooling in email sender.
                                           43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                           43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                           43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                           43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                                      43819: Fix merge error
                                      43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                      43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                                   39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                                   39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                           43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                      43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                                43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                                   - Patched POI to:
                                                     - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                                     - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                                     - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                                     - handle -ve fractions (just did not work)
                                                     - limitations:
                                                       - custom text gets stripped (still better than before)
                                                       - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                           43564: CLOUD-939: <Record Only>
                                                43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                                   - Original jar did not get removed in previous commit
                                                   << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                                      43823: Fix merge error
                                      43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43579: Public api test, fix intermittent test failures (hopefully)
                                           43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                           43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                      43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                                      43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                           43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                           43762: Fix the build
                                      43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                     39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                                        - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that
                                                          much slower even for western encodings
                                                          - It still does csv and xml to pdf
                                                          - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf)
                                                            The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used.
                                                          - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason.
                                                          - transformer.complex.Text.Image now has a wild card first transformer for the same reason.
                                                        - Allow transformer config element supportedTransformations to wild card source or target mimetype
                                                39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                     39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                                        - Fix build failures (not sure about RecordsManagementAuditServiceImplTest)
                                                        - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox
                                                40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                     40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                        - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                                     40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                        - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                          including fixes that existed on only one or the other.
                                                        - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                          an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                           43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                                      43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                      43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43762: Fix the build
                                      43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                40859: public api:
                                                40862: CLOUD-555: "Updating comment fails because node not found"
                                                40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                                40979: Added tests for non-numeric params and non-european characters
                                                41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                                     41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                                41097: Added quickshare and cloudsync to cmis filter list
                                                41098: Renamed serializer/deserializer lists for RestJsonModule
                                                41099: Cleaned up consistent Rest responses - CLOUD-574
                                                41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                                41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                                41105: Added key for trusted layer7 relationship
                                                41137: Public api:
                                                41146: Fix trusted authentication against OpenCMIS
                                                41168: Public apI;
                                                41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                                41170: public api:
                                                41171: public api:
                                                41172: public api:
                                                41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                                41186: Fix solrcore properties
                                                41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                                41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                                41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                                41325: Public api:
                                                41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                                41369: Public api:
                                                41422: Sample OAuth call for the Resource Owner Password flow
                                                41427: Sample OAuth call for the Client Credentials flow
                                                41433: Public api: (1) parameterize site members/people sorting in service api
                                                41434: Public api: minor comment service fix
                                                41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41439: Public api: fix for default tenant id in CMIS requests
                                                41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                                41457: Fix build
                                                41461: Public api: more tests
                                                41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                                41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                                41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                                41628: Public api: more tests
                                                41672: CLOUD-672: "404 Error when browsing child files/folder "
                                                41673: Public api: more tests
                                                41675: CLOUD-674: "Root network calls need to return application/json content type"
                                                41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41823: Public api: more tests
                                                41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                                41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                                41867: CLOUD-711: "It should be possible to remove a favourite site"
                                                41957: Public api: - error handling improvements - more tests
                                                41970: Public api: - fix build  (add missing files)
                                                41972: Public api: - more tests (including OpenCMIS TCK)
                                                42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                                42058: Public api: changed logging package name
                                                42124: Public api: - more tests - minor fixes
                                                42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                                42126: Public api: fix up OpenCMIS tests
                                                42171: Consistency fix for CLOUD-695.
                                                42180: Fix build
                                                42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                                42214: Public api tests (cmis)
                                                42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                                42253: Fix build
                                           42735: (RECORD ONLY) Fix build (fix merge error)
                                      43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                           43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                           43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                      43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                                      43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                                      43881: Revert CLOUD-942: Reverse merge r43830 
                                      43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                                      43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                                      43924: Disable intermittent OpenCMIS tests
                                      43925: Disable intermittent test
                                      43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                                      43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                            44185: Merged BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                                 43021: CLOUD-803, CLOUD-487: Send localised e-mails
                                 43024: CLOUD-486 - Choose UI language.
                                 43085: CLOUD-803, CLOUD-487: Revert changes to pre-existing process(String, Object, Writer) method.
                                 43086: CLOUD-803, CLOUD-487: Fix broken unit tests
                                 43106: CLOUD-486 - Choose UI language.
                                 43159: CLOUD-486 - Choose UI language.
                                 43160: CLOUD-803, CLOUD-487: Fix broken unit tests
                                 43182: CLOUD-803, CLOUD-487: Fix broken unit tests.
                                 43230: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                                 43246: Bug fix for CLOUD-899.  Added if to catch null values.
                                 43267: CLOUD-486 - Choose UI language.
                                 43329: CLOUD-911 - Localization change is not working in the preference page from CLOUD-486 - Fixed by setting cookie path to /
                                 43626: CLOUD-909 - Keep Email address when language changes
                                 43631: CLOUD-909 - Keep Email address when language changes - Updated Spring Surf version
                                 43704: Enables all currently cloud supported languages in Cloud specific config file
                                 43723: CLOUD-486 - Fix right border of select options and add extra languages
                                 43880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      43879: FRENCH: Translation updates based on EN r43703
                                 43965: CLOUD-486 - Add French, German, Spanish, Italian and Japanese for new fields and pages.
                                 43988: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      43983: GERMAN: Translation updates based on EN r43703
                                      43984: SPANISH: Translation updates based on EN r43703
                                      43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                                      43986: ITALIAN: Translation updates based on EN r43703.
                                      43987: JAPANESE: Translation updates based on EN r43703.
                                 44021: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      42871: GERMAN: Cloud Translation, based on r 42416
                                      42879: SPANISH: Cloud Translation, based on r 42416
                                      42890: ITALIAN: Cloud Translation, based on r 42416
                                 44026: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                                 44033: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                                      44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                                 44077: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                 44093: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch
                                      42871: (RECORD ONLY) GERMAN: Cloud Translation, based on r 42416
                                      42879: (RECORD ONLY) SPANISH: Cloud Translation, based on r 42416
                                      42890: (RECORD ONLY) ITALIAN: Cloud Translation, based on r 42416
                                      43120: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                                           43100: Update the salesforce amp to include the CORS Filter
                                           43101: Update web.xml to enable to the CORS Filter with filter-mapping
                                           43117: Add updated amp with removed CORS Filter.  CORS Filter is now available in 3rd-party libs
                                           43118: [CLOUD-724] Add CORS Filter jar to 3rd-party libs
                                           43119: [CLOUD-724] Add missing jar java-property-utils-1.6.jar to 3rd-party libs
                                      43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers
                                      43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
                                           42257: CLOUD-649: Updates UI action for Granular Permissions
                                           42295: CLOUD-33: Updates labels
                                           42303: CLOUD-651: Limit user search to site members only.
                                           42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
                                           42427: Removes multi-select manage-permissions dialogue.
                                           42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
                                           42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
                                           42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
                                           42807: CLOUD-863: Reordered code to avoid AccessDeniedException
                                           43259: CLOUD-901: Revert showComments check so it handles undefined permission
                                           43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
                                           43307: CLOUD-900: Follow-up fix
                                      43353: Fix for remote transform server with new cloud environment
                                      43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
                                           39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                                                Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                                                  36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                                                     - Will be revisited to add better comments
                                                  36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                                                     - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                                                     - Better code documentation
                                                     - Removed dev/test code
                                                     - Improved error config handling
                                                  36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                                                     - Changed "link" parameter to "href" (instead of "page") to match actions.
                                                  39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                                                  39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
                                           39875: Configurtion changes to enable Google Docs V2 within the web tier.
                                           39881: It's extension ... not extention
                                           39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
                                           39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
                                           40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
                                           40624: Update Google Docs AMPs
                                           40635: Merge Google Docs Cloud AMPS to Feature Branchs
                                           40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
                                           40897: Google Docs AMP update 
                                           41165: Merge Updated AMPs for [GOOGLEDOCS-83]
                                           41179: Update AMPs for [GOOGLEDOCS-87]
                                           41262: Update AMPs for GOOGLEDOCS-89
                                           41493: Update AMPs for [GOOGLEDOCS-93]
                                           41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
                                           41805: Update AMPs for [GOOGLEDOCS-101]
                                           41840: Add AMPs with i18n strings
                                           43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
                                           43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
                                           43320: Add googledocs repo declaration
                                      43538: Fix pesky solrcore.properties ... remove hardcoded amiller ;-)
                                      43605: Merged BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK to BRANCHES/DEV/CLOUD1:
                                           43033: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK:
                                                39313: CLOUD-194: Add new trial network account type.
                                                39332: CLOUD-194: Add translation for new network account type.
                                           43218: CLOUD-194: Change Trail Network subscription level to Enterprise
                                      43658: Merged HEAD to BRANCHES/DEV/CLOUD1:
                                           43655: BDE-73: exclude more failing tests which are never run
                                           43653: BDE-73: tune surefire config to make it pass with Sonar 3.3
                                      43752: Merged HEAD to CLOUD1
                                           BDE-73: Repair coverage report, broken since Sonar upgrade   
                                      43879: (RECORD ONLY) FRENCH: Translation updates based on EN r43703
                                      43983: (RECORD ONLY) GERMAN: Translation updates based on EN r43703
                                      43984: (RECORD ONLY) SPANISH: Translation updates based on EN r43703
                                      43985: (RECORD ONLY) FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                                      43986: (RECORD ONLY) ITALIAN: Translation updates based on EN r43703.
                                      43987: (RECORD ONLY) JAPANESE: Translation updates based on EN r43703.
                                      43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                                      44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                                           43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                                      V4.0-BUG_FIX
                                                          36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                                          36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                                          36608: First part of ALF-14209 SOLR - does not support query for all stores
                                                          36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                                          36954: ALF-14209 SOLR - does not support query for all stores
                                                          37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                                          37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                                          37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                          37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                                          37628: Build Fix
                                                          37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                          37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                                          37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                          38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                                          38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                                      V4.1
                                                          38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                                      V4.1-BUG-FIX
                                                          40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                                          41201: Fix for ALF-15767 Group query using cm:authorityName
                                                          41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                                          41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                          41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                          41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                                          41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                                          41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                                          41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                                 Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                                          41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                                          41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                                 Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                          41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                                          41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                          41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                                          42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                          42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                          42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                                42547: Fix the model used for embedded tests.
                                                42659: Add missing test model
                                                42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                                      42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                                      42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                                42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                                      working copy sync r42514 through r42659
                                           43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     42363: ALF-16213: renaming versioned file results in file being deleted.
                                                42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX:
                                                          42389: CLOUD-796: handle unknown custom content/folder type
                                                          42396: CLOUD-796: handle unknown custom content/folder type
                                                          42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                               41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly
                                                          42406: CLOUD-796: handle unknown custom content/folder type
                                                      42409: CloudSync: CLOUD-796 / ALF-16226 -  hide sync props in forms (eg. edit props) for sync'ed custom content type
                                                42428: ALF-16217: Remove unnecessary restriction on content type
                                                42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                                           43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                                42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                                           43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                                           43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                                42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                                42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                                           43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                                           43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                                           43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                                42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                                42868: Fix failing build tests + further/revised public api tests
                                                42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                                42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                                42899: Fix build
                                           43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                                           43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                                43234: CLOUD-313: Implment Transport pooling in email sender.
                                                43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                                43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                                43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                                43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                                           43819: Fix merge error
                                           43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                           43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                                        39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                                        39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                                43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                           43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                                     43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                                        - Patched POI to:
                                                          - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                                          - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                                          - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                                          - handle -ve fractions (just did not work)
                                                          - limitations:
                                                            - custom text gets stripped (still better than before)
                                                            - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                                43564: CLOUD-939: <Record Only>
                                                     43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                                        - Original jar did not get removed in previous commit
                                                        << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                                           43823: Fix merge error
                                           43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43579: Public api test, fix intermittent test failures (hopefully)
                                                43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                                43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                           43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                                           43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                                43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                                43762: Fix the build
                                           43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                          39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                                             - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that
                                                               much slower even for western encodings
                                                               - It still does csv and xml to pdf
                                                               - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf)
                                                                 The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used.
                                                               - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason.
                                                               - transformer.complex.Text.Image now has a wild card first transformer for the same reason.
                                                             - Allow transformer config element supportedTransformations to wild card source or target mimetype
                                                     39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                          39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
                                                             - Fix build failures (not sure about RecordsManagementAuditServiceImplTest)
                                                             - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox
                                                     40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                          40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                             - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                                          40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                             - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                               including fixes that existed on only one or the other.
                                                             - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                               an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                                43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                                           43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                           43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43762: Fix the build
                                           43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     40859: public api:
                                                     40862: CLOUD-555: "Updating comment fails because node not found"
                                                     40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                                     40979: Added tests for non-numeric params and non-european characters
                                                     41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                                          41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                                     41097: Added quickshare and cloudsync to cmis filter list
                                                     41098: Renamed serializer/deserializer lists for RestJsonModule
                                                     41099: Cleaned up consistent Rest responses - CLOUD-574
                                                     41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                                     41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                                     41105: Added key for trusted layer7 relationship
                                                     41137: Public api:
                                                     41146: Fix trusted authentication against OpenCMIS
                                                     41168: Public apI;
                                                     41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                                     41170: public api:
                                                     41171: public api:
                                                     41172: public api:
                                                     41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                                     41186: Fix solrcore properties
                                                     41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                                     41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                                     41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                                     41325: Public api:
                                                     41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                                     41369: Public api:
                                                     41422: Sample OAuth call for the Resource Owner Password flow
                                                     41427: Sample OAuth call for the Client Credentials flow
                                                     41433: Public api: (1) parameterize site members/people sorting in service api
                                                     41434: Public api: minor comment service fix
                                                     41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                     41439: Public api: fix for default tenant id in CMIS requests
                                                     41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                     41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                                     41457: Fix build
                                                     41461: Public api: more tests
                                                     41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                                     41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                                     41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                                     41628: Public api: more tests
                                                     41672: CLOUD-672: "404 Error when browsing child files/folder "
                                                     41673: Public api: more tests
                                                     41675: CLOUD-674: "Root network calls need to return application/json content type"
                                                     41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                     41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                     41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                     41823: Public api: more tests
                                                     41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                                     41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                                     41867: CLOUD-711: "It should be possible to remove a favourite site"
                                                     41957: Public api: - error handling improvements - more tests
                                                     41970: Public api: - fix build  (add missing files)
                                                     41972: Public api: - more tests (including OpenCMIS TCK)
                                                     42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                                     42058: Public api: changed logging package name
                                                     42124: Public api: - more tests - minor fixes
                                                     42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                                     42126: Public api: fix up OpenCMIS tests
                                                     42171: Consistency fix for CLOUD-695.
                                                     42180: Fix build
                                                     42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                                     42214: Public api tests (cmis)
                                                     42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                                     42253: Fix build
                                                42735: (RECORD ONLY) Fix build (fix merge error)
                                           43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                                43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                                43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                           43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                                           43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                                           43881: Revert CLOUD-942: Reverse merge r43830 
                                           43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                                           43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                                           43924: Disable intermittent OpenCMIS tests
                                           43925: Disable intermittent test
                                           43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                                           43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                            44196: CLOUD-678 - Incorrect link for 'To change your notifications settings, go here.' message
                            44201: CLOUD-486 - Choose UI language
                            44202: CLOUD-487: Fix emails after merge of template refresh and localised mail features
                               44414: JAPANESE: Cloud email template translation
                            44622: Fixes: CLOUD-1037 - removes unnecessary elements from inside the a tag.
                            44623: Cloud-189 - Corrects text and layout for already created email templates.
                            44624: Fixes: CLOUD-1044: Updates Email template
                            44625: Fixes: CLOUD-1042: Updates Email template
                            44626: Fixes: CLOUD-1043: Updates Email template
                            44627: Fixes: CLOUD-1041: Updates Email template
                            44764: CLOUD-1080: Fixes encoding error.
                            44767: CLOUD-1086: Text update to email template
                            44888: Email template updates - fixes CLOUD-1099 and CLOUD-1102.
                            44892: Fixes error with Activities email - the template fails to process if the only activities are based on follow events. It now processes and gets sent, but with some confusion, see CLOUD-1123
                            44914: Fixes CLOUD-1097 - Alt text not displaying due to unspecified image dimensions and colour. Also minor code clean up.
                            45145: CLOUD-1123 - Filter out "Following" activities from activity feed email.
                            45251: Email template text updates following review.
                            45289: Fix issue where email was not sent for 'Invite People'
                            45306: Externalises strings for cloud emails
                            45316: Adds some defensive code to prevent unused variables being a problem for templates.
                            45328: Email translation updates
                            45334: Resolve CLOUD-1162: Ability to change sign-up, reminder and reset password timer durations via properties
                            45369: Fixes Following Email template
                            45376: Resolve CLOUD-1172: Following email does not show domain correctly
                            45401: Corrects layout bug in email template
                            45407: Removes unnecessary full stop.
                            45408: Adds missing email template translations
                            45430: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                                 45329: FRENCH: Cloud translation updates based on EN r45266
                                 45330: GERMAN: Cloud translation updates based on EN r45266
                                 45332: SPANISH: Cloud translation updates based on EN r45266
                                 45333: JAPANESE: Cloud translation updates based on EN r45266
                                 45427: SPANISH: Cloud 1 translation updates based on EN r45266
                            45453: Fix for CLOUD-1164 - Failed login is not handled correctly (on email refresh branch)
                            45474: Fixes: CLOUD-1189: Incorrect variable used in translated property files.
                            45484: Fixes: CLOUD-1190 incorrect quote marks in JA file
                            45487: CLOUD-1186: Fixes issue with reminder emails not being localised.
                            45501: Potential fix for: CLOUD-678
                            45503: Resolve CLOUD-1188: Emails are not rendered as HTML, even though they are HTML
                            45539: Resolve CLOUD-1195: Invite people email not rendering as HTML, even though it is HTML
                            45559: CLOUD-1197: Fixes issue with reset password template not recognising all the variables in all cases.
                            45579: Resolve CLOUD-1186: Email not localized, CLOUD-1202: Invite people / Invite site email sometimes comes in English and is not localized
                            45609: Resolve test failures introduced fixing CLOUD-1186
                            45613: Resolve CLOUD-1210: Locale is not replicated across tenants if a user has been invited to one or more secondary tenants
                            45616: Resolve CLOUD-1205: activities email template the feed are not localized
                            45642: Fixes: CLOUD-1211 and CLOUD-1212 - externalises two hard coded strings. Translations to follow.
                            45645: CLOUD-1205: activities email template the feed are not localized
                            45646: CLOUD-1203: Invite to Site and site reminder the role should be localized
                            45654: ALL LANG: Translation updates to email templates, following fixes made for CLOUD-1212, CLOUD-1211.
                            45678: Removes hidden chars at start of the file.
                            45680: Fixes more hidden chars that the start of UTF8 files.
                            45683: Fixes: CLOUD-1216: Typo in Italian properties file.
                            45693: Resolve CLOUD-1204: Task type in the workflow emails are not localized
                            45702: Minor translation updates following linguistic review.
                            45717: GERMAN: Translation updates based on linguistic review
                            45719: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1/ to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                                 45718: ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import)
                            45797: Resolve CLOUD-1226: The task details are not showing in localized details in task list
                            45798: Fix single quote encoding in language property file (related to CLOUD-1230, but does not resolve it across the board).
                       45966: Translation update to fix CLOUD-1270 in FR and ES
                       46011: Fix NPE while sending emails (in non-test mode)
                  46148: Resolve CLOUD-1247: When the cookies are not set in browser and the user is trying login in share without the browser cookies getting a null pointer exception
                  46151: Merge BRANCHES/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                  46204: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       46014: Fix for ALF-17732 - SWF files are considered insecure content and should not be displayed directly in the browser.
                  46232: Resolve CLOUD-1291: Activity Email: "Liked" category should be "Likes"        
                  46307: ALL LANG: Email translations updated based on fix for CLOUD-1291
   48351: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47556: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             46712: (RECORD ONLY) Create branch for Cloud Convergence from the latest state of CLOUD1 (Build 360, Revision 46379)
        47570: Bring POM dependencies in sync with latest upgrade in 3rd-party: opencmis to 0.8.0 and Jackson to 1.9.4
        47572: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             47571: CONV: Fix CLOUD2 compile error (TenantFileContentStore.java) (minor reformat)
        47580: CONV: Fix CLOUD2 compile error (CloudSiteServiceImpl.listMembersImpl)
        47593: CONV: Fix CLOUD2 compile error (CloudAuthenticationPassword2Dao.loadUserByUsername)
        47594: CONV: Fix CLOUD2 compile error (CloudTenantCMISStrictDictionaryService.getRegistry)
        47609: Fix OpenCMIS dependencies again
   48356: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47613: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             47610: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD2:
                  47157: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/CLOUD1:
                       44058: Creating DEV/FEATURES/CLOUD1_SAML1 branch from revision 44032 of CLOUD1 b316
                       44095: Cloud SAML: Repo SAML Auth API - webscript placeholders (for SSO/SLO request/response)
                       44177: Cloud SAML: Repo SAML Auth API - webscript placeholders (for SSO request/response)
                       44227: SAML - Share implementation - Note WIP!
                       44249: Cloud SAML: Repo SAML Auth API - skeleton SAMLConfigAdminService (enable/disable)
                       44273: CLOUD-1000, CLOUD-1002: added SAML SSO services to Thor.
                       44274: Added opensaml libs to the build file.
                       44284: Added opensaml dependency, to fix the failed build.
                       44298: Cloud SAML: Repo SAML SSO (Auth) API -  check whether network/tenant is SAML-enabled or not (CLOUD-1018)
                       44315: added jks keystore.
                       44323: added correct version of saml.keystore.jks
                       44350: Changed the issuer.name in the sp-config, and the alias in the key store to reflect the issuer name.
                       44351: Changed the key store type to JKS.
                       44440: Cloud SAML: Share SAML - follow-on to r44227 to fix/add missing SAML authnRequest fields (CLOUD-1039)
                       44448: Cloud SAML: Repo SAML SSO Authn Request (CLOUD-998)
                       44477: Cloud SAML: Repo SAML SSO Authn Response (CLOUD-999)
                       44524: Made SAMLAuthnResponseController to redirect Idps Response to repo. Also added idps.properties file in order to test multiple IdPs.
                       44588: Cloud SAML: Repo SAML - minor: change REST urls from ".../cloud/saml/..." to just ".../saml/..."
                       44609: CLOUD-1002: Modified SAMLResponse processing implementation to get the SAMLResponse from share via json rather than directly through HttpServletRequest that OpenSAML requires.
                       44611: Added a few modifications to improve SAMLHttpPostSimpleSignDecoder implementation.
                       44633: CLOUD-1070: SAML sprint 4: Repo REST - Get SP (Alfresco) Public Certificate
                       44634: Modified ACS post json data, to endued null for non-existent user.
                       44635: CLOUD-1040 "SAML sprint 4: Share UI (SAML-based login) - handle SAML auth response (IdP -> Repo)" checkpoint/wip
                       44645: Cloud SAML: Repo REST API - Get SP (Alfresco) metadata (specific to Network)
                       44684: Cloud SAML: CLOUD-1053 - Email links (signup/invite)
                       44703: Cloud SAML: CLOUD-1058 - Repo REST API to Get SP (Alfresco) metadata (specific to Network)
                       44717: Cloud SAML: CLOUD-1079 - additional login validation when Registering/Creating a new user for a IdP/SAML-enabled Network
                       44721: Modified SAML admin config to include the required attributes to set SSO. The most important attributes are ssoEnabled and IdP’s SSO URL. For setting the attributes, see the wiki page. Note: IdP's certificate uploading/storing hasn't been implemented yet.
                       44739: Cloud SAML: CLOUD-1079 - additional login validation when Registering/Creating a new user for a IdP/SAML-enabled Network
                       44774: Cloud SAML: CLOUD-1053 - UI/Email flows when user exists in IdP but not Alfresco => signup/invite + IdP login form + enter profile & activate
                       44793: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled network/tenant (if implied by username)
                       44794: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled network/tenant (if implied by username)
                       44799: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled Network/Tenant (if implied by username and not a Network/Admin)
                       44809: Cloud SAML: CLOUD-1039 - SAML login entrypoint (localhost:8081/share/{network}/saml) 
                       44810: Cloud SAML: minor - comment only
                       44833: Cloud SAML: CLOUD-1053 - UI/Email flows when user exists in IdP but not Alfresco => signup/invite + IdP login form + enter profile & activate
                       44837: Added OpenSAML dependencies into projects.xml.
                       44840: Added a valid certificate to the saml.keystore.jks, as the certificate was expired.
                       
                       44856: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                       44857: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                       44858: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                       44859: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                       44860: (RECORD ONLY) Fix pesky solrcore.properties
                       
                       44896: Cloud SAML: minor comments/descriptor updates for SAML config admin (CLOUD-1051 & CLOUD-1052)
                       44915: Fixed CLOUD-1111 "SAML: Share UI - allow /share/{network} as a SAML entry point (if network is SAML-enabled)"
                       44919: Removed unecessary url encoding of sso & slo urls in json response
                       44926: WIP commit for CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                       44934: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service (WIP)
                       44948: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service (WIP)
                       45027: Fixed CLOUD-1111 "SAML: Share UI - allow /share/{network} as a SAML entry point (if network is SAML-enabled)" part 2
                            - Is now triggered for urls w a trailing slash after the network name, i.e. /share/alfresco.com/
                       45036: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service
                       45058: CLOUD-1051, CLOUD-1052: Added functionalities to store java certificate as content in order to make OpenSAML to validate IdP's signature dynamically.
                       45067: First cut of CLOUD-1051, CLOUD-1052, check-in, included the wrong classes. Added the correct files now.
                       45087: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)" - WIP
                       45143: CLOUD-1052: added functionalities to SAMLConfigAdmin to return the certificate status and expiration date. Also fixed SAMLConfigAdmin update bug.
                       45151: Fixed saml-config-admin-get template.
                       45173: Cloud SAML:  lowercase userId/emailAddress (for SAML requests/responses)
                       45206: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service
                       45229: CLOUD-1090 "SAML: SLO (SingleLogOut) - Share UI - Logout (SP-initiated)" - WIP
                       45240: CLOUD-1051: Added functionalities to handle multipart form-data submitted by SAML Config Admin screen.
                       45262: Cloud SAML: CLOUD-1129 - SLO - use "session index" (from original SSO) in logout request
                       45269: Added edit-cancel-16.png icon
                       45270: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                       45276: CLOUD-1090 "SAML: SLO (SingleLogOut) - Share UI - Logout (SP-initiated)"
                       45279: Adding common download file icon
                       45280: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                       45281: Cloud SAML: CLOUD-1088 - Repo REST/Services for SLO - fix to invalidate user's current ticket ...
                       45284: CLOUD-1146: Upgraded commons-codec from 1.4 to 1.5
                       45285: Fix pesky solrcore.properties
                       45288: CLOUD-1146: Upgraded commons-codec from 1.4 to 1.5
                       45305: Cloud SAML: CLOUD-1088 - Repo REST/Services for SLO - check SAML logout response (status code) and throw exception
                       45311: CLOUD-1051: Added functionalities to support DER-formatted certificate upload.
                       45314: Prepared config admin screen download links to use the attached header, so they become proper download links (rather than "view in browser" links)
                       45320: Updating certificate input field label after request form Jamal to "Upload to IdP certificate"
                       45321: Fine tuning the certificate label for Jamal, hopefully he's happy with this version :-)
                       45322: CLOUD-1112 "SAML: Share UI: updated profile page - to explain to user's that they're entering an Alfresco password"
                       45327: CLOUD-1113 "SAML: Share UI - updated Change Password page"
                       45341: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                       45353: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                            - Added additional field for IDP initiated logout request
                            - Refactored field name for SP initiated logout request
                       45365: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                       45372: CLOUD-1109 "SAML: Share UI - New user - login + profile page (without requiring a signup/invite email link)"
                       45374: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                       45377: CLOUD-1052: Fixed enable/disable SAML SSO config page for an existing SAML setup.
                       45390: CLOUD-1051, CLOUD-1052: Added support for IdP SLO response URL. Also, renamed idpSloURL to be idpSloRequestURL.
                       45391: Cloud SAML: CLOUD-1158 - Repo-side to allow SP cert/metadata links to be downloaded rather than just viewed (in Share)
                       45403: Refactored urls before implementing idp initiated logouts to avoid name clashes
                       45429: CLOUD-1128 "SAML: SLO (SingleLogOut) - Share UI - handle SAML logout request (IdP-initated)"
                            - Note! Share SAML SP Service urls have been changed and needs to be (re)configured in the IDP:
                               * Assertion Consumer Service URL 
                                 - Endpoint URL: /share/alfresco.com/saml/authnresponse (POST)
                               * SLO Service URLs 
                                 - Endpoint URL: /share/alfresco.com/saml/logoutrequest (POST) 
                                 - Response URL: /share/alfresco.com/saml/logoutresponse (POST)
                       45433: CLOUD-1069 "SAML: draft text for Network Admin screen - field names / "i"nfo pop-up"
                       45464: Improved error test for saml settings screen.
                       45465: CLOUD-1135 "SAML: SLO (SingleLogOut) - Share UI - error/warning page if SLO fails unexpectedly" part 1 of 2
                       45490: CLOUD-1181: Fixed IdP initiated SLO, by adding RelayState.
                       45492: Message component improvements and a generic guest message page
                       45493: CLOUD-1135 "SAML: SLO (SingleLogOut) - Share UI - error/warning page if SLO fails unexpectedly" part 2 of 2
                       45524: Cloud SAML: CLOUD-1191 - initial fix for SLO error (affects PingFederate, not OpenAM) due to multiple sessionIndexes
                       45552: Making callback pattern consistent with the pattern that should be used in all other multipart webscripts
                       45639: Cloud SAML: CLOUD-1192 - Improve Repo INFO logging - eg. also show Assertion ID (as requested by customer/partner)
                       45647: CLOUD-1091: Changed SAML keystore loading functionalities, to use existing alf keystore.
                       45684: CLOUD-1213: Added support for Network-Specific SP entityID. 
                       45704: Cloud SAML: CLOUD-1209 - SLO failure after directly activating a new user (ie. login + complete profile)
                  47164: Fix SVN merge
                  47168: Fix merge/test
                  47250: Fix merge issue (remove unwanted files)
                  47444: Fixes: CLOUD-1397: Incorrectly encoded copyright messages.
                  47462: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/CLOUD1:
                       47461: Share fix for: CLOUD-1399: Check tenant is SAML enabled before getting IDP details
                  47467: Repo fix for: CLOUD-1399: Reduce ERROR/stacktrace to one line WARN if non-SAML enabled network tries to access repo saml web script
                  47502: Fixes CLOUD-1397: corrects copyright encoding in Share footer.
        47614: Fix merge fail - remove dupe commons-codec-1.5 from Eclipse 3rd-party .classpath
        47628: Fix 3rd-party eclipse classpath (put back commons-codec-1.5.jar)
   48359: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47647: Fix merge - build/test - SOLRTrackingComponentTest.testFilters & SOLRTrackingComponentTest testGetNodeMetaData 
   48361: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47743: Remove outdated sharepoint context file, as had been done on CLOUD1 in r44571
        47752: CONV: Fix CLOUD2 test error (MultiTAdminServiceImpl.initTenant)
        47757: CONV: Fix CLOUD2 test error (MultiTAdminServiceImpl - startTenants/initTenant)
        47830: CloudConv: Fix on CONV_V413 - follow-on fix to ALF-15687 (PreferenceServiceImpl) done for V4.1.2+ to check admin authority (should not hardwire check to default "admin")
        47831: CLOUD-1421 Upgrade wss4j from 1.5.4-patched to 1.6.9
        47844: CLOUD-1421 Upgrade wss4j from 1.5.4-patched to 1.5.12
   48362: CONV: Fix SAML cache config
   48363: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47863: CONV: CLOUD-1407 - Implement people filtering based on aspects in people CQ
        47875: CONV: CLOUD-1407 - Implement people filtering based on aspects in people CQ
        48050: CONV: CLOUD-1407 - Implement people filtering based on aspects in people CQ
   48365: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        48179: CONV: Fix test(s) - SubscriptionServiceActivitiesTest testFollowingActivity (& SiteServiceTest testGetSites)
        48205: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             47562: (RECORD ONLY) Rename POM file for convenience
             47564: (RECORD ONLY) Fix relative path to parent pom
             47573: (RECORD ONLY) CONV: Fix CLOUD2 compile error (TenantFileContentStore.java)
             47589: (RECORD ONLY) CONV: Fix CLOUD2 compile error (CloudPersonServiceImpl.getPeople)
             47603: (RECORD ONLY) CONV: Fix CLOUD2 compile error (CloudPersonServiceImpl.getPeople)
             47615: (RECORD ONLY) Add dependency to OpenSAML 2.5.3
             47630: (RECORD ONLY) Remove outdated Eclipse project files - use Maven to generate new ones if needed
             47635: (RECORD ONLY) Separate test sources from main sources
             47644: (RECORD ONLY) Remove dependency to netcdf - will get it from Alfresco Repository, and hopefully one that doesn't embed commons-codec
             47653: (RECORD ONLY) Re-enable opensaml Maven repo, which is alive again
             47663: (RECORD ONLY) Add config jars in the test classpath
             47687: (RECORD ONLY) Switch test database to MySQL
             47691: (RECORD ONLY) CONV: Fix CLOUD2 merge/test - missing class AuthorityBridgeLink
             47692: (RECORD ONLY) Move the recreation of the database to a Maven profile
             47744: (RECORD ONLY) Add a little more config dependencies
             47749: (RECORD ONLY) Add enterprise-remote-api config as well
             47759: (RECORD ONLY) Configure Tomcat Maven plugin
             47763: (RECORD ONLY) Move test_analyticsService.js to test resources, where it belongs
             47764: (RECORD ONLY) CONV: Fix CLOUD2 merge/test - NPE in RepositoryAuthenticationDao.getUserEntryOrNull
             47777: (RECORD ONLY) CONV: CLOUD2 - fix NPE (HomeSiteContentImportActionExecuter.executeImpl) seen in unit test logs
             47800: (RECORD ONLY) Package Sharepoint module in the war
             47812: (RECORD ONLY) CONV: Add missing cloud module tests to AllCloudModuleTests (for running locally in Eclipse)
             47813: (RECORD ONLY) Add application of 4 amp files: googledocs, salesforce, mediamanagement, sharepoint
             47814: (RECORD ONLY) Add pluginRepository, to be able to reference the alfresco-maven-plugin
             47820: (RECORD ONLY) Apply googoedocs + mediamanagement to thor-share + add missing htmlparser
             47849: (RECORD ONLY) Add cors-filter + alfresco-spp config files
             47916: (RECORD ONLY) Remove use of systemProperties when running tests: they override the ones defined in dev environment. Now rely on the presence of a property file passed through DB_PROPERTIES in Continuous Integration environment.
        48209: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             48204: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD2:
                  47848: Merged BRANCHES/DEV/FEATURES/CLOUD-1374 to BRANCHES/DEV/CLOUD1:
                       47598: Merge DEV/CLOUD1 to DEV/FEATURES/CLOUD-1374
                           47122 : CLOUD-1374 
                           47127:
                           47247:
                           47344:
                           47415:
                           47449:
                           47457:
                       47637: Merge DEV/CLOUD1 to DEV/FEATURES/CLOUD-1374 
                            47131: CLOUD-1374
   48366: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (already up-to-date - effectively a record-only)
        48164: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CONV_V413:
              47501: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 
                  45475: Fix for ALF-17510 - Upgrade of htmlparser from 1.6 to 2.1 
   48377: CONV: Fix build/test (FeedNotifierTest.testFailedNotifications)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48403 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-03-20 11:11:55 +00:00
Jan Vonka
6e5b951fe5 Merged BRANCHES/DEV/CONV_HEAD to HEAD: 
48055: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
         46833: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                30799: THOR-172: Switch Tenant via public API
         46836: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                30853: Initial implementation of THOR-209. Webscript to get invitation/invitee status.
                30855: More on THOR-209. Added siteTenantTitle to the webscript response.
                30858: Apply generated cloud license
                30859: Miscellaneous tidy-ups and refactorings, additional documentation and some webscript JSON additions. All as part of THOR-209.
                30860: Miscellaneous doc improvements around the MT/Activiti workarounds.
                30861: Removing unnecessary TenantUtil.runas in test code.
                30863: THOR-204. Dev mode option to send invite/sign-up emails to spring-injected address.
                30865: Temporarily disable subscriptions (followers) - pending ALF-9957
                30866: THOR-175: Set and enforce file space quota for tenant
                30868: Deleted obsolete/empty dir
                30869: THOR-210: disable jobs that are not used/required (eg. AVM orphan reaper)
                30870: THOR-209. Have fixed up issue with getting properties from completed workflow instances.
                    Changed invitation to use pathInstanceId instead of taskId as the 'id' for these workflows. Now consistent with signup. Commented in the test that calls invitee-status.get
                30871: THOR-209. Adding the inviteeIsActivated value to the webscript response.
                30872: THOR-204. When emails are sent to the dev-only, spring-injected email address, the subject is now prefixed with the orig
                30879: THOR-209. Making sure inviteeIsActivated is present for both in-flight and completed workflows.
                30883: Resolve THOR-212
                30895: THOR-172: Switch Tenant via public API
                30896: THOR-209. Renaming some files so that they refer to invitation status rather than invitee status. Also added some documentation to make this dicstinction clearer. This is not a general purpose script to get the status of an invitee to a site. It is only for checking if a particular invitation workflow is complete and then getting some additional state data.
                30897: THOR-175: Set and enforce file space quota for tenant
                30900: Changing invitation-status webscript to auth=none; runas=Admin to support invitation flow of exteernal users. Part of THOR-209.
        46845: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                30967: Invite & signup improvemengts
                30969: Share Activities
                30976: Remove unreliable hosts from isReachableDomain test
   48066: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
        46857: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35731: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31149: Initial Commit of Analytics Service
              31150: Second draft of Analytics Service
              31151: First cut of forms runtime supporting balloons on "blur" event as requested
              31163: FORMS RUNTIME CHECKPOINT - before making the yellow mandatory only being displayed "on load and until focused"
              31168: Refactored Analytics Service to be static
              31170: Forms runtime as agreed in meeting
   48067: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
        46861: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35752: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31220: THOR-49. Implementation of Reset Forgotten Password workflow.
              31227: (RECORD ONLY) Fix merge error
              31237: Add email validation to registration and invite services:
              31239: THOR-219: Merge fix (re-disable Repo<->SOLR ssl config)
   48069: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
        46864: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35754: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31240: MultiSelectAutoComplete now has configurable validation (& tooltips)
              31241: Tenant site count usage/quota - exposed via Account API
              31250: Made events enumerations
              31251: Forgot to add AnalyticsEvent class to previous commit
              31271: Attempt at fixing test dependencies and remove intermittent test
   48070: Merged DEV/CONV_V413 to DEV/CONV_HEAD (NOTE! Added TenantXxxx classes and change in FormUIGet Will be removed in later revisions)
        46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1:
                   30971: (RECORD ONLY) Creating SURF update branch for THOR1
                   30979: Commit initial Surf lib changes, Cloud classes and config overrides
                   30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory
                   31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory
                   31076: Successful signup and page redirection
                   31091: Correct redirects from <application context> and <application context>/<tenant name> URLs
                   31098: Updated Surf libs
                   31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name.
                   31133: Updated Surf libs and JavaDoc updates
                   31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule
                   31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support.
                   31229: Signup and invitiation completion updates
                   31242: Fixed up invitation, signup and tenant switching problems
                   31270: Fixed forms issue (can now create folders in doc lib)
                   31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant.
                       This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch.
                       I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant.
                       SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates.
                       Added new test cases at the Java API level. (Was formerly just at REST API level).
                   31286: (RECORD ONLY) Reset solrcore.properties files
                   31297: Fixed FlashUpload problem
                   31298: Fixed application context only login
                   31302: Fixed no user profile image url issue
                   31306: Updates to TenantUserFactory to defensively handle missing tenant data
                   31326: Repo switch tenant fixes:
                   31356: Resolve switch tenant niggles, with assistance from Erik:
   48072: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46934: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           46930: Adding extension point to forms runtime's FormUIGet for modifying submission url
        46937: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35762: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31408: Latest Spring Surf Libs (including SubComponentEvaluator param tokenization fix for THOR)
              31409: Tenant usage/quota -> person count
              31412: RM module cleanup & almost finsihed THOR-287 & THOR-288
              31434: Fix Thor Share eclipse project
   48073: CONV: Fix slingshot eclipse .classpath (add freemarker dep)
   48074: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46940: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           35766: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31450: Additional DB query support in Repo/Core
                31451: Tenant people count (internal + total) usage/quota
                31453: Fix issue uploading small files which resulted in zero byte content
                31456: Fix paging and total count (1000+) when listing accounts
                31457: THOR-312. Addition of NETWORK_ADMINS group authority.
                31461: THOR-314. I've overridden people.get with a cloud-specific template.
                    This adds an isExternal JSON field to each person object.
                31463: THOR-316 webscript filter on people.get for isInternal, isExternal.
                    Overridden people.get.desc.xml and .js in the cloud module in order to add query param
                    and add additional filtering.
                31464: Base work for THOR-178 "F5: Existing user has forgotten password and needs to reset it"
                31468: THOR-321 Create cloud:networkAdmin aspect.
                31469: THOR-315 Return isNetworkAdmin in overridden people.get webscript.
                31470: THOR-275: Add simple caching (for PropertyUniqueContext - used via AttributeService)
                31471: THOR-318 people.get has new cloud query parameter 'networkAdmin'
                31477: THOR-275: temp build fix
                31479: THOR-324 Demote user from admin.
                    New method on RegistrationService to demote a user from NetworkAdmin and tests.
                31484: THOR-319. Fixing maxResults on people.get when internal/external/admin filtering is applied.
                    This issue is not really resolved, but I've commented the code to illuminate the issue.
                31485: THOR-275: fix build/test
                31486: Working forgot password for THOR-178 (problem accessing the reset-password email link though)
                31488: THOR-184: Disable user usages
                31495: F156: Allow super system admin to login to any tenant
                31496: Fix for personExists since hiding admin
                31500: THOR-178
                31501: THOR-329 Add a get-reset-password status webscript.
                31503: Finished forgot password flow THOR-178
                31507: THOR-328: add fixed adjustment (for people usage)
                31508: Back out some of the hidden admin changes
                31509: Revert mistaken check
                31510: THOR-326 Changes to DAO layer to allow update of account type.
                31513: Cloud Console updates
                31514: Switch Network now uses tenants from the user object (instead of making a remote call)
                31515: THOR-326 Changes to the REST & Service layer to allow update of account type.
   48075: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (effectively record-only - no changes)
        46849: Merged PATCHES/V4.1.3 to DEV/CONV_V413
             46779: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp.
             - Improved fix that uses the bridge table cache if it is available
             - Groups queried for pooled tasks still limited to 100 by default but can be configured with system.workflow.maxAuthoritiesForPooledTasks
             - Overall number of results can be cut off with system.workflow.maxPooledTasks
   48076: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46855: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35706: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  31049: THOR-175: set and enforce per-tenant quota
                  31053: THOR-204: Add dev email mode option
   48077: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
        46944: Merge fallout - fix compile error.
   48078: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (already fixed - no changes)
        46858: Fix compile error
   48079: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46953: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35767: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31516: Hidden admin - attempt 2
              31517: THOR-326. Update to REST-cient rcq file following 31515, which allows for account upgrade.
              31518: THOR-326. DaveC asked me to move the paid business account type out of test config and into product config.
              31519: After tenant switch the client side resources are more sensitive (new requires /res) which it didn't before. This solves the webpreview bug and some other minor stuff.
              31520: THOR-175: Set and enforce file space quota for tenant
              31522: THOR-330. Return Account Class data in Account REST API.
              31523: THOR-330. Added new rsp data into desc.xml sample response.
              31524: THOR-322: refactor tenant file usage/quota
              31525: Skip activity post lookups that have exceptions
              31526: Root webdav to st:sites for now (as per current beta.alfresco.com)
              31528: THOR-323 & THOR-324 Promotion and demotion of users to/from NetworkAdmin.
              31534: Account Summary now also displays name & summary
              31535: Fix for THOR-320. Alfresco logo image in the various Cloud emails is broken.
              31538: Account Summary now handles -2 & MultiSelectAutoComplete  doesn't bounce when selecting first item
              31540: Implementation of THOR-335 webscript for account-types.get
              31541: Account Summary now displays date correctly
              31542: Some paths to client side resources that were missing "/res" in the path
              31547: Various label changes according to Kathryns docs & some new login/forgot password links in invite/signup forms
              31555: Refactored Analytics Service to send JSON Analytics properties
              31557: Some changes to cloud email templates following feedback from Kathryn, Erik.
              31558: THOR-322: refactor tenant file usage/quota
              31559: Turned 'sign up' email URLs into links rather than text. Yes, we'll make these buttons at some point but I just want them to be clickable for now.
   48080: Merged DEV/CONV_V413 to DEV/CONV_HEAD (UI ONLY)
        46954: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35771: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31563: THOR-123: modules are no longer started for each tenant 
              31566: Update account class display names:
              31567: THOR-123: temp' put back "applyToTenants=true" ...
              31575: THOR-123: pre-req
              31579: Fix issue where setting a preference meant that the person could no longer login:
              31581: Addition of isNetworkAdmin, accountClassName and accountClassDisplayName to the metadata.get webscript, as required by Erik.
              31582: Re-enabling RenditionServiceIntegrationTest which was failing. See THOR-106.
              31584: THOR-123: pre-req
              31585: THOR-347: disable test (pending this JIRA) - ChainingUserRegistrySynchronizerTest
              31590:  Account changes
              31591: Upgrade accound button is now a mailto link pointing to sales@alfresco.com
              31592: Added isNetworkAdmin
              31593: Made sure tooltips are hidden when a dialog/overly is showed/hidden
              31594: Disabling test again pending proper fix. THOR-106
              31595: Reduce log level
              31600: THOR-123: mark modules with "applyToTenants=false"
              31601: Tooltips now dissapear when panel/overlays are destroyed (not only hidden)   
   48081: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46955: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35779: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31605: (RECORD ONLY) THOR-336. Fixing /res/themes URLs in activity emails.
                     Fix /res/themes URL in newly located activity emails.
   48088: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46874: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35709: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  31054: Fix for email templates (getDirectReadableChannel -> File does not exist)
        46875: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35711: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  31055: Re-enable activity feed notifications and subscriptions (followers)
   48094: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46894: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35759: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  31386: Added some tenancy-awareness to ActionService.
                  31388: Addition of accountTypeId to metadata.get webscript.
                  31391: Fix for unreported issue that arises from the invitation workflow having moved from the system to the inviter tenant.
                  31392: Build fixes: Add pseudo-support for tenant switching in web script test f/w
                  31393: The final fix for the 'external user invites other external user' scenario.
                  31398: Tenant usage/quota - site count
                  31405: Build fix for failing ActionService tests. Compensating actions were not running on the correct tenant.
                  31407: Resolve THOR-248: Extensions is not deployed as part of the build
   48095: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge)
        46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1:
                     30971: (RECORD ONLY) Creating SURF update branch for THOR1
                     30979: Commit initial Surf lib changes, Cloud classes and config overrides
                     30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory
                     31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory
                     31076: Successful signup and page redirection
                     31091: Correct redirects from <application context> and <application context>/<tenant name> URLs
                     31098: Updated Surf libs
                     31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name.
                     31133: Updated Surf libs and JavaDoc updates
                     31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule
                     31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support.
                     31229: Signup and invitiation completion updates
                     31242: Fixed up invitation, signup and tenant switching problems
                     31270: Fixed forms issue (can now create folders in doc lib)
                     31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant.
                         This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch.
                         I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant.
                         SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates.
                         Added new test cases at the Java API level. (Was formerly just at REST API level).
                     31286: (RECORD ONLY) Reset solrcore.properties files
                     31297: Fixed FlashUpload problem
                     31298: Fixed application context only login
                     31302: Fixed no user profile image url issue
                     31306: Updates to TenantUserFactory to defensively handle missing tenant data
                     31326: Repo switch tenant fixes:
                     31356: Resolve switch tenant niggles, with assistance from Erik:
   48109: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46917: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot/web-framework-commons)
             35766: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
        46918: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot)
             35767: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
        46919: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35768: Fix compile issue from merge
        46921: Merge fallout - fix compile error.
        46949: Test fallout
        47126: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35954: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35960: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35961: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35962: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35963: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35964: Spring Surf library refresh
             35995: Fix merge issue
             35999: Fix merge issue
        47144: Fix merge/test failures (WCMTestSuite)
        47539: CLOUD-1375 - fix WCM unit test fallout: SandboxServiceImplTest.testDeleteSandbox + WebProjectServiceImplTest.testDeleteWebProject
   48111: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46954: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35771: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31563: THOR-123: modules are no longer started for each tenant 
                31566: Update account class display names:
                31567: THOR-123: temp' put back "applyToTenants=true" ...
                31575: THOR-123: pre-req
                31579: Fix issue where setting a preference meant that the person could no longer login:
                31581: Addition of isNetworkAdmin, accountClassName and accountClassDisplayName to the metadata.get webscript, as required by Erik.
                31582: Re-enabling RenditionServiceIntegrationTest which was failing. See THOR-106.
                31584: THOR-123: pre-req
                31585: THOR-347: disable test (pending this JIRA) - ChainingUserRegistrySynchronizerTest
                31590:  Account changes
                31591: Upgrade accound button is now a mailto link pointing to sales@alfresco.com
                31592: Added isNetworkAdmin
                31593: Made sure tooltips are hidden when a dialog/overly is showed/hidden
                31594: Disabling test again pending proper fix. THOR-106
                31595: Reduce log level
                31600: THOR-123: mark modules with "applyToTenants=false"
                31601: Tooltips now dissapear when panel/overlays are destroyed (not only hidden)   
        46956: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35782: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31607:  "Hide everything but the doclib" customizations
                     - Dashlets adjustments
                       * Addons RSS feed - hidden
                       * Site Calendar - hidden
                       * Content I'm editing - added <@markup> extension points so blog, wiki & forum sections are hidden by cloud extension module
                       * Site Data List - hidden
                       * Site Links - hidden
                       * Wiki - hidden
                       * User Calendar - hidden
                     - URL rewrites
                       * Forgot & reset password urls now prettyfied, not using "-default-/"
                     - Duplicated slingshot presets to avoid future slingshot changes popping up in the cloud          
                31611: MT: fix ability to delete a disabled tenant
                31612: THOR-339: Disable/enable logins for a network (account update)
                31621: THOR-106. Taking a failing test class out again, pending fix. Hmmmm.
                31623: THOR-357 - support shared CMIS dictionary
   48112: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes)
        46957: Test fallout
   48113: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes - already pre-merged)
         46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1:
                     30971: (RECORD ONLY) Creating SURF update branch for THOR1
                     30979: Commit initial Surf lib changes, Cloud classes and config overrides
                     30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory
                     31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory
                     31076: Successful signup and page redirection
                     31091: Correct redirects from <application context> and <application context>/<tenant name> URLs
                     31098: Updated Surf libs
                     31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name.
                     31133: Updated Surf libs and JavaDoc updates
                     31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule
                     31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support.
                     31229: Signup and invitiation completion updates
                     31242: Fixed up invitation, signup and tenant switching problems
                     31270: Fixed forms issue (can now create folders in doc lib)
                     31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant.
                         This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch.
                         I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant.
                         SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates.
                         Added new test cases at the Java API level. (Was formerly just at REST API level).
                     31286: (RECORD ONLY) Reset solrcore.properties files
                     31297: Fixed FlashUpload problem
                     31298: Fixed application context only login
                     31302: Fixed no user profile image url issue
                     31306: Updates to TenantUserFactory to defensively handle missing tenant data
                     31326: Repo switch tenant fixes:
                     31356: Resolve switch tenant niggles, with assistance from Erik:
   48114: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
         46962: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            40147: (RECORD ONLY) French: Cloud Translation update from Gloria (based on EN rev38372)
            42709: (RECORD ONLY) FRENCH: Translation updates based on EN r42416
            42871: (RECORD ONLY) GERMAN: Cloud Translation, based on r 42416
            42879: (RECORD ONLY) SPANISH: Cloud Translation, based on r 42416
            42890: (RECORD ONLY) ITALIAN: Cloud Translation, based on r 42416
            43879: (RECORD ONLY) FRENCH: Translation updates based on EN r43703
            43983: (RECORD ONLY) GERMAN: Translation updates based on EN r43703
            43984: (RECORD ONLY) SPANISH: Translation updates based on EN r43703
            43985: (RECORD ONLY) FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
            43986: (RECORD ONLY) ITALIAN: Translation updates based on EN r43703.
            43987: (RECORD ONLY) JAPANESE: Translation updates based on EN r43703.
            44031: (RECORD ONLY) JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
            44032: (RECORD ONLY) GERMAN: Translation updates based on EN r43703. Corrects missing line break.
            45329: (RECORD ONLY) FRENCH: Cloud translation updates based on EN r45266
            45330: (RECORD ONLY) GERMAN: Cloud translation updates based on EN r45266
            45332: (RECORD ONLY) SPANISH: Cloud translation updates based on EN r45266
            45333: (RECORD ONLY) JAPANESE: Cloud translation updates based on EN r45266
            45427: (RECORD ONLY) SPANISH: Cloud 1 translation updates based on EN r45266
            45718: (RECORD ONLY) ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import)
            45838: (RECORD ONLY) FRENCH: Cloud Translation update based on EN r45266
            45966: (RECORD ONLY) Translation update to fix CLOUD-1270 in FR and ES
            46365: (RECORD ONLY) ALL LANG: Translation updates based on EN r46289
            46366: (RECORD ONLY) ALL LANG: Updates copyright year to 2013
            46377: (RECORD ONLY) ALL LANG: Adds strings missing from previous commit.
         47192: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (record-only - WebDAV mostly resolved as part of 36117 merge)
            36408: (RECORD ONLY) Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                 36404: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                      36060: THOR-1373: Proxied WebDAV must generate correct URLs when URL-rewriting is used.
                      36083: THOR-1373: Proxied WebDAV must generate correct URLs when URL-rewriting is used.
         47369: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            41180: (RECORD ONLY) Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                 40482: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
                    - ALF-15453: Incorrect manage permissions working for a file/folder
                 Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                    40486: ALF-15453: Incorrect manage permissions working for a file/folder
         47377: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            41048: (RECORD ONLY) Merged DEV/V4.1-BUG-FIX to DEV/CLOUD1
                  40382: Fix for ALF-15491 SOLR is generating queries for lucene style cross-language support
                  40632: Fix for ALF-15487 Search not working for queries containing 3-digit versions
                         Fix for ALF-15356 SOLR doesn't support searching by cm:name of file with underscore and dots
                  40662: Eclipse classpath fixes
                  41032: Fix for ALF-15753       Infinite loop during Solr ACL indexing when ACL Changeset batch is empty
         47393: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1:
                 41674: ALF-15967: Using START_USER_ID_ instead of "initiator" property to query process instances started by user X to prevent extra joins + removed unused constants
                 41650: Fixed CLOUD-667: Merged fix for ALF-14438 into CLOUD1-BUG-FIX + using START_USER_ID_ instead of custom "initiator" property to query initiator to boost performance even more
         47412: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            42252: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                  42233: Fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
                         and related CLOUD-760 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
         47429: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            42200: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
         47433: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             CLOUD-808: Fix for timer deploying MT-process when shared is required caused test to fail
         47435: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                 43100: Update the salesforce amp to include the CORS Filter
                 43101: Update web.xml to enable to the CORS Filter with filter-mapping
                 43117: Add updated amp with removed CORS Filter.  CORS Filter is now available in 3rd-party libs
                 43118: [CLOUD-724] Add CORS Filter jar to 3rd-party libs
                 43119: [CLOUD-724] Add missing jar java-property-utils-1.6.jar to 3rd-party libs
         47485: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            44203: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                  44200: Probable fix for     ALF-16895 SOLR: Cannot find files after restart and reindex solr
            44276: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                  44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr
                         - fix initial cache state to cope with duplicate leaf/aux doc entries.
            44314: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                    44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr
                           - fix incremental cache state to cope with duplicate leaf/aux doc entries.
         47523: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            44573: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/CLOUD1:
                 44572: Clean up of unused files.
            44576: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                 44518: [CLOUD-955] Change CORS filter-mapping to use servelet instead of url
            44691: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                 44688: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                 44689: [CLOUD-1072] Add public api url to CORS filter mapping.  Move CORS filter mapping to live above the publicapi filter mappings.  OPTIONS calls made to the CORS filter should be evaluated before Layer7 authentication.
         47548: Merged DEV/CLOUD2 to DEV/CONV_V413
            46931: Overriding form runtime's submissionUrl using extesnion point in FormUIGet
            46984: Overriding entire sent-invites.js (instead of modifying the core slingshot code) with a copy of the core code modified to work with the cloud invite apis.
            46986: Overriding help pages config in cloud-config.xml (rather than modifying the core files!)
         47553: Merged DEV/CLOUD2 to DEV/CONV_V413
            47421: Overriding entire sent-invites.get ftl & properties (instead of modifying the core slingshot code) with a copy of the core code modified to fit the cloud requirements.
            47442: Add web overlay for share + tune embedded librairies
            47455: Add dependency on jetty-webapp to compile the tests
   48115: CONV: Fix cache defs (propertyUniqueContextCache & siteNodeRefCache)
   48117: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46959: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35790: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31624: Resolve THOR-302: transformation-client-1.0.0-SNAPSHOT.jar not in alfresco/WEB-INF/lib:
              31632: More reliable test, hopefully
              31644: Fix unreported issue in aws-context.xml.sample (not well-formed XML)
              31645: Customized invite links to use "cloud dialog" instead of "invite page" for the following components:
              31662: New Analytics events and tests
              31663: New Analytics events and tests
              31678: Addition of isExternal data to site membership webscripts.
   48118: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46960: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35791: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31684: THOR-367 - #1 Within Site 
                   - Remove all page components other than site dashboard, document library and members 
                   - Remove customize site
              31685: New lightweight webscript to retrieve user/network metadata about the currently authenticated user in the current tenant.
              31693: THOR-365: Private site cannot be access (since surf-config is not imported) - causes: Could not resolve view with name ...
              31695: THOR-367 - #2 Document Library 
                    - remove Create Content... menu 
                    - remove actions: manage aspects, change type, publish, manage rules (for folders) 
                    - document-details page: remove publishing history panel
              31697: For reference only: update description of cmis/test webscript 
   48119: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46972: Fix test fallout (re: THOR-293)
   48120: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge)§
        47001: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35798: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31805: Adding utility method to our CollectionUtils class that I need as part of pending invitations work (THOR-373).
                31809: Parameterized signup url & email
                31812: THOR-373 Pending invitations.
                31814: Made changes to way aid is captured ready for allowing events to override aid if needed
                31820: Mapping of network admin to system admin part 1:
             35801:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31829: Fixed THOR-352 "Incorrect validation of emails on "Forgot Password" page"
                31830: (RECORD ONLY) Exclude ExportDbTest; issues with MySQL
                31831: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                     31784: Fix up unit test.
                31833: Email validation now allows 7 character long top level domain (so we can do tests with example)
                31834: New form colors for invalid & mandatory fields
                31837: THOR-327 - remove bootstrapped guest / guest@<tenant>
                31838: THOR-327 - remove bootstrapped guest / guest@<tenant>
                31844: Added missing headers to Java files.
                31845: Mapping of network admin to system admin part 2:
                31846: Addition of very basic test script for the Script API of AnalyticsService.
             35803: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31853: Forms refactor first cut - for review
                31855: THOR-387. Analytics event for user activation is sent.
                31858: THOR-387. Fixing a corner-case bug in SendAnalyticsRequest.
                31863: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                     31841: Build Fix
                31868: THOR-361: Fix /service/index
                31881: THOR-387. Adding analytics event for site invitation.
                31882: THOR-387. Fixing analytics event for site invitation.
                31883: THOR-66: disable some of the /alfresco (web.xml) servlet mappings
                31884: THOR-387. Analytic event callouts for site invitation response.
                31899: Revert solrcore.properties checkin
                31900: THOR-249: override edition interceptor
                31901: Fix for THOR-396. Spelling mistake on signup screen.
                31902: Resolve THOR-251: Update the Help URLs for Cloud
                31904: Resolve THOR-403: -system- tenant not found logged from server
                31918: Create site form tweak (manual form.validate() call required since javascript is changing a another fields value)
                31919: Logout page refactoring
                31925: Create site now resets form before show using forms-runtime's new "reset" method
                31926: Disable flash upload
                31927: THOR-363: increase initial file quota
                31930: Updated SimpleDB service so you can set the SimpleDB domain to record events too
             
        47003: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35804: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31933: THOR-387. Analytics.
                    Added analytic call for account registration (the initial signup, not the activation, which was added previously).
                    This adds a new mandatory parameter to the signup webscript: "source" as well as various new optional parameters.
                    The same parameter is now mandatory on the RegistrationService.
                    Impacts on test code.
                    Changed the rest-client .rcq file to show new required parameter.
                    Changed AnalyticsProperties to take the Object wrappers for primitives as these are optional and so we need to be able to pass null.
                    Added a new (hidden) field to Erik's signup Share page to send an appropriate value for the signup.
                31939: THOR-404: disable JBPM
                31943: THOR-387. Analytics.
                    I've overridden upload.post.js to add analytics data for file uploads.
                31946: Fixed THOR-385 "Account summary file usage bar does not display for any theme other than the default theme"
                31947: Fixed THOR-308 "Invite user drop-down works incorrectly"
                31948: Resolve THOR-384: It is impossible to create user administrator@'domain':
                31949: Follow-up fix for case sensitive user names
                31953: THOR-311: It is impossible to create workflow when 'Send Email Notifications' flag is checked:
                31959: Removing change-password override since user shall be able to change his password
                31961: Fix tests after recent username/email address changes
                31966: Grey Theme
                31979: Dropping Analytics logging level down to 'warn' from 'debug'.
                31982: Fixed THOR-419 "UI edits required"
                31983: Fixed THOR-419 "UI edits required" part 2
                32003: THOR-422. Spurious error logging during signup/registration (not activation).
                    This was because the analytics event action code assumed the user exists, which they don't do at registration, of course.
                32004: Resolve undefined undefined seen in invite signup dialog
                32006: Restricted tentant component now displays dialog instead of gray page
                32007: THOR-300: fix AWS config
                32013: Fixed THOR-353 "No validation for the fields on the "Reset Password" page"
                32014: Fixed THOR-423 "Removing the yellow "Welcome to your dashboard, firstname, lastname" causes error"
                32018: Made sure new cloud theme (greyTheme) also has new theme border & bgs (making the account quota being displayed)
   48122: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47007: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35817: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  32250: (RECORD ONLY) Merged /HEAD to BRANCHES/DEV/THOR1: (ok'ed with DC/DG)
                       31750: Solr: Fix owner Id cache
                       31751: Fix for ALF-11104: add authenticated user to authorisations list in PermissionService + fix inconsistency in AuthorityService
                       31760: Correct Fix for SOLR owner ID cache
                       32172: Fixes for: 
                                  ALF-11521 Protect SOLR running against the wrong Alfresco DB      
                                  ALF-11602 Solr Core Tracker - does not need to re-init CMIS dictionary (when there are no model changes)       
                                  ALF-11621 SOLR old versions of tracked models are not getting deleted when models are updated
                       32234: Fix for ALF-11568 SOLR indexing is ignoring properties that are indexed but not tokenised and not stored - was WCMQS navigation is broken
                  32256: THOR-488. Tidy up account types.
                  32258: Login analytics event.
                  32260: Reduce logging on startup for enabled tenants (see also THOR-475 / THOR-81)
                  32262: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                       32139: Fix for ALF-11599 - Section ''Others are Editing'' shows documents that should not be present
   48123: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge)
        47038: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35811: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32019: Merged rev 32016 from THORSURF1
                32021: THOR-428: Fix activity feed email notifications (to contain network/tenant ctx)
                32024: Fixed "THOR-424 'Upload File' button is disabled in FF for the second and futher uploads"
                32026: Restricted tenant page now has link back to users home dashboard so he doesn't feel stuck
                32029: Fixed GetRequest test to ignore uid's that aren't emails (like admin)
                32030: THOR-310: Override getCacheKey method from AbstractCachedViewResolver to ensure that each tenant gets their own cached copy of each Share page (this ensures that nested Component config gets processed for all tenants)
                32031: Resolve THOR-417 Workflow notification emails do not take into account tenant in their urls back to Share
        47039: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35812: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32041: Label changes according to Kathryn's "UI Text_scenario 5.docx"
                32052: THOR-405: Fix 'contentstore.deleted' to be on S3 (albeit co-mingled)
                32058: Removed unnecessary borders from profile pages
                32065: Fix build issue where cloud share war was not being cleaned before build
                32066: Fix those pesky solrcore properties
                32071: THOR-461: fix following email notification (to contain network/tenant ctx)
                32076: Fix to disable error on unit tests
                32077: Added logging to NullPointerException fix
             35814: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32103: Finally! A fix for THOR-193. :)
                32119: Fix for setting theme as network admin
                32120: Improved text on upgrade account page
                32124: Refactored CloudInvitationService Integration Tests to allow for easier expansion and then I expanded.
                32130: Fix for THOR-457. Already have an account email template needs updating/fixing.
                32135: THOR-464 Fix "ThumbnailRegistry init does not scale with # of tenants"
                32140: Apply Beta logos and adjust about dialog for cloud
             35815: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32144: THOR-438: Latest Spring Surf libs (fix relative URI login redirect problem caused by un-encoded URI)
                32147: THOR-475 - improvement(s) to trim time to create tenant
                32148: THOR-475 - improvement(s) to trim time to create tenant
                32154: GreyTheme updates
                32157: THOR-430: Forgot password dialog: UI text not what was suggested
                32159: GreyTheme updates
                32174: THOR-454 - User can find content stored in Company Home/Data Dictionary via Advanced Search
                32176: Signup page now cloud.alfresco.com
                32179: THOR-475 - improvement(s) to trim time to create tenant
                32184: Remove jargon from workflow names and descriptions
                32185: Pesky solrcore.properties
             35816: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32188: THOR-478: Updated Spring Surf libs - fixed relative URL redirect after login including support for @ symbol in URL
                32195: Fix for THOR-379. Pending invitations UI show invitee emails as links to profile pages - even for non-existent users.
                    Added yet more data to the CloudInvitation REST API: inviteeIsMember which tells caller whether the invitee is already a member of the tenant in which the invitation is running.
                    Returning this flag through the Java API & REST API
                    Tweaks to the Share JS so that it renders a <span> for invitees who are not members and an <a> for those who are. 
                32198: Replace workflow text with task related text
                32202: Resolve THOR-481: Moving or copying content always shows error popup but always succeeds
                32204: Build fix
                32238: THOR-290: Configurable google-analytics tracking code script insertion
                32239: Tidying up some UI text. Missing apostrophes, invitation instead of invite.
                32241: THOR-471: Added GetSatisfaction feedback widget
             35818: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32266: Addition of createSite analytics recording.
                32268: THOR-505: Disable (turnoff autostart) of unused subsystems
                32270: Adding in some theme colors that dissapeared (will make the quota bar get displayed again)
                32272: Resolve THOR-354: (None) displayed for network administrators
                32273: THOR-499: New Relic monitoring updates
                32279: Implemented THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages"
                32280: Fixed THOR-474	  "Password Strength indicator does not conform with other leading website password indicators"
   48125: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (repo pre-merge)
         47053: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
            32377: (RECORD ONLY) THOR-565: fix unfortunate type that affects activity permissions (for connected users - either via site membership or followers)
            32378: CollectionUtils method for collection intersection. Should be merged to HEAD.
            32383: THOR-572: remove unused JBPM servlets (deployprocess, workflowdefinitionimage)
            32384: Fixed THOR-549 "Google Analytics Installed but not seeing any events raised on GA reports"
            32389: Fix for THOR-567 "userprofile broken"
            32401: THOR-525 - fix MT-specific issue (deleting site does not clear associated activities within tenant)
            32409: THOR-66: disable WebDAVServlet (does not need to load-on-startup) + a few others
            32414: Theme updates from linton
            32423: Fixed THOR-661 "Limit number of simultaneous connections in drag n drop upload"
            32424: THOR-81: support for signup/activate scaling tests
   48126: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47058: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot/web-framework-commons/3rd-party) 
             35827: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35828: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35829: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35830: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35831: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35832: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
   48129: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47067: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35844: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35845: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35846: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35847: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35848: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35849: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35850: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35853: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35854: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35855: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
        47069: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35860: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  33057: Refactored Slingshot overrides so that they are now in the Thor-Share private module. This has been done to reduce conflict issues when merging back into HEAD.  The overrides are now in the correct locations (the only files that could not be moved to the private module are urlrewrite.xml and surf.xml).
             35870: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (part 1 - repository project)
                  33022: THOR-662: Email templates should load/resolve (initially) from classpath
        47071: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35877: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  33090: ALF-10826: hidden aspect
                  33091: THOR-416: fix surf-config folder (appears where it shouldn't)
                  33093: Sweep through email templates.
        47072: Fix merge error (FeedCleaner)
        47073: Fix merge error (WorkflowTestSuite)
        47074: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35881: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  33104: Tweak to invitation email template
                  33112: Refactored impl of THOR-694 so that content limit of 25Mb is on by default in THOR for both local FS and S3-based FS.
                      Changed ContentLimitProvider bean to take String limit, rather than long - to allow empty string value on core Alfresco.
                      Set the limit to the empty string in core Alfresco, which means 'no limit'.
                      Applied the limit always.
                      Set the limit to 25Mb in Thor/alfresco-global.properties
                      Fixed a minor bug in error reporting due to previous exception renaming.
        47076: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35885: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  33134: THOR-874: Updated Surf libs Fixes ArrayIndexOutOfBoundsException caused by multiple threads apply i18n extensions to a WebScript
                  33135: Missing WebScripts sources JAR from r33134
                  33153: Resolve THOR-551: Password Hashes Need Review
                  33154: Update to latest email blacklist
                  33155: Fixed THOR-534 "Login Box shows scroll bars"
                  33156: Build fix for tests failing due to recent password changes
                  33157: Build fix for updated email blacklist
                  33172: THOR-776: Re-implement Share override as guided by Erik
                  33173: THOR-831: Text in Someone
             35886: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  33174: Latest SpringSurf libs - improved RemoteClient reused of connections per request thread.
                  33176: THOR-833: Search: clicking on All Sites returns no results
   48131: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47098: (RECORD ONLY) Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35895: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                34105: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   33267: (RECORD ONLY) Created branch THOR1_SPRINTS (from THOR1 r33255)
                   33269: Snapshot of simple redeploy shell script (for AWS mini-dev/test env)
                   33272: JMeter test script
                34106: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   33313: THOR-928: Added caching for i18n bundles provided by extensibility modules (latest Surf libs, r980)
   48133: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47097: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35906: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35907: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
        47099: Fix merge/compile error.
        47103: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35913: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35914: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35915: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35916: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35917: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
        47111: Fix merge error
        47115: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
        47132: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             36053: 1st pass at upgrading to latest Spring Surf
             36059: Fix CloudInvitationService tests for cloud1
        47133: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48135: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46977: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35792: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31724: Can't compare pages using page.url.uri anymore since that doesn't include the tentant, now skips that part of the url and uses page.id instead.
              31733: Add account info to user network web script
              31736: Refactored RegistrationServiceImpl.promote... so that it uses the presence of cloud:personExternal aspect to prevent promotion of external users rather than account-based data.
           35794: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31744: Account relates to url & various Share features now hidden in cloud
              31746: 1/5 for THOR-341 "F147: Share features are disabled for external network member"
           35796:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31756: THOR-265: Currently the first user to sign up to a dmain becomes the domain admin, and can view the full admin console. Is this going to change?
              31771: Added stub for SimpleDBAnalytics Service
              31772: Final interfaces and integration with SimpleDB for Analytics
              31774: Modified landing_time key for MixPanel
              31776: Implemented #3 for THOR-341 "F147: Share features are disabled for external network member"
              31777: Resolve test classpath since introduction of new thor libs
              31779: Implemented #3 for THOR-341 "F147: Share features are disabled for external network member" part 2
              31781: Resolve issue getting access to account settings when network admin of paid business account
              31783: Implemented #2 for THOR-341 "F147: Share features are disabled for external network member"
              31794: Minor changes after review with DavidC and NeilM
              31797: Collaboration title improvement: Now hiding the html elements used to build the menu until the menu is created so ui doesn't bump and look ugly.
              31799: Part #6 of THOR-367 "F60: Remove Share features not required for Cloud"
                   - 6) Document Selectors - root is Sites folder
              31801: Removed ugly "extra" borders around some of the input fields in the user profile form
              31802: Fixed part #7 of THOR-367 "F60: Remove Share features not required for Cloud"
                   - 7) Edit Profile - remove edit email from edit profile form
              31804: Fixed part #5 of THOR-367 "F60: Remove Share features not required for Cloud"
                   - 5) Move... / Copy... dialog  - remove repository  - remove my user home
   48136: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        47001: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35798: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31805: Adding utility method to our CollectionUtils class that I need as part of pending invitations work (THOR-373).
              31809: Parameterized signup url & email
              31812: THOR-373 Pending invitations.
              31814: Made changes to way aid is captured ready for allowing events to override aid if needed
              31820: Mapping of network admin to system admin part 1:
           35801:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31829: Fixed THOR-352 "Incorrect validation of emails on "Forgot Password" page"
              31830: (RECORD ONLY) Exclude ExportDbTest; issues with MySQL
              31831: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                   31784: Fix up unit test.
              31833: Email validation now allows 7 character long top level domain (so we can do tests with example)
              31834: New form colors for invalid & mandatory fields
              31837: THOR-327 - remove bootstrapped guest / guest@<tenant>
              31838: THOR-327 - remove bootstrapped guest / guest@<tenant>
              31844: Added missing headers to Java files.
              31845: Mapping of network admin to system admin part 2:
              31846: Addition of very basic test script for the Script API of AnalyticsService.
           35803: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31853: Forms refactor first cut - for review
              31855: THOR-387. Analytics event for user activation is sent.
              31858: THOR-387. Fixing a corner-case bug in SendAnalyticsRequest.
              31863: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                   31841: Build Fix
              31868: THOR-361: Fix /service/index
              31881: THOR-387. Adding analytics event for site invitation.
              31882: THOR-387. Fixing analytics event for site invitation.
              31883: THOR-66: disable some of the /alfresco (web.xml) servlet mappings
              31884: THOR-387. Analytic event callouts for site invitation response.
              31899: Revert solrcore.properties checkin
              31900: THOR-249: override edition interceptor
              31901: Fix for THOR-396. Spelling mistake on signup screen.
              31902: Resolve THOR-251: Update the Help URLs for Cloud
              31904: Resolve THOR-403: -system- tenant not found logged from server
              31918: Create site form tweak (manual form.validate() call required since javascript is changing a another fields value)
              31919: Logout page refactoring
              31925: Create site now resets form before show using forms-runtime's new "reset" method
              31926: Disable flash upload
              31927: THOR-363: increase initial file quota
              31930: Updated SimpleDB service so you can set the SimpleDB domain to record events too
   48137: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        47003: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35804: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31933: THOR-387. Analytics.
                  Added analytic call for account registration (the initial signup, not the activation, which was added previously).
                  This adds a new mandatory parameter to the signup webscript: "source" as well as various new optional parameters.
                  The same parameter is now mandatory on the RegistrationService.
                  Impacts on test code.
                  Changed the rest-client .rcq file to show new required parameter.
                  Changed AnalyticsProperties to take the Object wrappers for primitives as these are optional and so we need to be able to pass null.
                  Added a new (hidden) field to Erik's signup Share page to send an appropriate value for the signup.
              31939: THOR-404: disable JBPM
              31943: THOR-387. Analytics.
                  I've overridden upload.post.js to add analytics data for file uploads.
              31946: Fixed THOR-385 "Account summary file usage bar does not display for any theme other than the default theme"
              31947: Fixed THOR-308 "Invite user drop-down works incorrectly"
              31948: Resolve THOR-384: It is impossible to create user administrator@'domain':
              31949: Follow-up fix for case sensitive user names
              31953: THOR-311: It is impossible to create workflow when 'Send Email Notifications' flag is checked:
              31959: Removing change-password override since user shall be able to change his password
              31961: Fix tests after recent username/email address changes
              31966: Grey Theme
              31979: Dropping Analytics logging level down to 'warn' from 'debug'.
              31982: Fixed THOR-419 "UI edits required"
              31983: Fixed THOR-419 "UI edits required" part 2
              32003: THOR-422. Spurious error logging during signup/registration (not activation).
                  This was because the analytics event action code assumed the user exists, which they don't do at registration, of course.
              32004: Resolve undefined undefined seen in invite signup dialog
              32006: Restricted tentant component now displays dialog instead of gray page
              32007: THOR-300: fix AWS config
              32013: Fixed THOR-353 "No validation for the fields on the "Reset Password" page"
              32014: Fixed THOR-423 "Removing the yellow "Welcome to your dashboard, firstname, lastname" causes error"
              32018: Made sure new cloud theme (greyTheme) also has new theme border & bgs (making the account quota being displayed)
   48147: CONV: fix merge issue - remove duplicate prop def (contentLimitProvider)
   48148: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        merge fix for r48072
   48149: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47111: Fix merge error
        47115: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
        47132: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             36053: 1st pass at upgrading to latest Spring Surf
             36059: Fix CloudInvitationService tests for cloud1
        47133: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48150: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (effectively RECORD ONLY - no changes)
        47173: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             36232: MT - fix pop of tenant ctx (to match push)
   48154: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        47038: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35811: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32019: Merged rev 32016 from THORSURF1
              32021: THOR-428: Fix activity feed email notifications (to contain network/tenant ctx)
              32024: Fixed "THOR-424 'Upload File' button is disabled in FF for the second and futher uploads"
              32026: Restricted tenant page now has link back to users home dashboard so he doesn't feel stuck
              32029: Fixed GetRequest test to ignore uid's that aren't emails (like admin)
              32030: THOR-310: Override getCacheKey method from AbstractCachedViewResolver to ensure that each tenant gets their own cached copy of each Share page (this ensures that nested Component config gets processed for all tenants)
              32031: Resolve THOR-417 Workflow notification emails do not take into account tenant in their urls back to Share
        47039: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35812: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32041: Label changes according to Kathryn's "UI Text_scenario 5.docx"
              32052: THOR-405: Fix 'contentstore.deleted' to be on S3 (albeit co-mingled)
              32058: Removed unnecessary borders from profile pages
              32065: Fix build issue where cloud share war was not being cleaned before build
              32066: Fix those pesky solrcore properties
              32071: THOR-461: fix following email notification (to contain network/tenant ctx)
              32076: Fix to disable error on unit tests
              32077: Added logging to NullPointerException fix
           35814: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32103: Finally! A fix for THOR-193. :)
              32119: Fix for setting theme as network admin
              32120: Improved text on upgrade account page
              32124: Refactored CloudInvitationService Integration Tests to allow for easier expansion and then I expanded.
              32130: Fix for THOR-457. Already have an account email template needs updating/fixing.
              32135: THOR-464 Fix "ThumbnailRegistry init does not scale with # of tenants"
              32140: Apply Beta logos and adjust about dialog for cloud
           35815: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32144: THOR-438: Latest Spring Surf libs (fix relative URI login redirect problem caused by un-encoded URI)
              32147: THOR-475 - improvement(s) to trim time to create tenant
              32148: THOR-475 - improvement(s) to trim time to create tenant
              32154: GreyTheme updates
              32157: THOR-430: Forgot password dialog: UI text not what was suggested
              32159: GreyTheme updates
              32174: THOR-454 - User can find content stored in Company Home/Data Dictionary via Advanced Search
              32176: Signup page now cloud.alfresco.com
              32179: THOR-475 - improvement(s) to trim time to create tenant
              32184: Remove jargon from workflow names and descriptions
              32185: Pesky solrcore.properties
           35816: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32188: THOR-478: Updated Spring Surf libs - fixed relative URL redirect after login including support for @ symbol in URL
              32195: Fix for THOR-379. Pending invitations UI show invitee emails as links to profile pages - even for non-existent users.
                  Added yet more data to the CloudInvitation REST API: inviteeIsMember which tells caller whether the invitee is already a member of the tenant in which the invitation is running.
                  Returning this flag through the Java API & REST API
                  Tweaks to the Share JS so that it renders a <span> for invitees who are not members and an <a> for those who are. 
              32198: Replace workflow text with task related text
              32202: Resolve THOR-481: Moving or copying content always shows error popup but always succeeds
              32204: Build fix
              32238: THOR-290: Configurable google-analytics tracking code script insertion
              32239: Tidying up some UI text. Missing apostrophes, invitation instead of invite.
              32241: THOR-471: Added GetSatisfaction feedback widget
           35818: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32266: Addition of createSite analytics recording.
              32268: THOR-505: Disable (turnoff autostart) of unused subsystems
              32270: Adding in some theme colors that dissapeared (will make the quota bar get displayed again)
              32272: Resolve THOR-354: (None) displayed for network administrators
              32273: THOR-499: New Relic monitoring updates
              32279: Implemented THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages"
              32280: Fixed THOR-474	       "Password Strength indicator does not conform with other leading website password indicators"
        47053: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32377: (RECORD ONLY) THOR-565: fix unfortunate type that affects activity permissions (for connected users - either via site membership or followers)
              32378: CollectionUtils method for collection intersection. Should be merged to HEAD.
              32383: THOR-572: remove unused JBPM servlets (deployprocess, workflowdefinitionimage)
              32384: Fixed THOR-549 "Google Analytics Installed but not seeing any events raised on GA reports"
              32389: Fix for THOR-567 "userprofile broken"
              32401: THOR-525 - fix MT-specific issue (deleting site does not clear associated activities within tenant)
              32409: THOR-66: disable WebDAVServlet (does not need to load-on-startup) + a few others
              32414: Theme updates from linton
              32423: Fixed THOR-661 "Limit number of simultaneous connections in drag n drop upload"
              32424: THOR-81: support for signup/activate scaling tests
   48157: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        Fixing merge issue from r48135
   48158: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
        47046: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
              Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32281: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1 (ok'd with DC):
                   32242: ALF-11664 Moderated sites should use site.public.group (from SysAdminParams) for setting the group with general access, as Public sites already do, rather than hard coding the EVERYONE group
              32283: Added "guest" to the list of blocked usernames, thereby showing failure to register guest@tenant.com, rather than allowing it and failing to activate the account later.
              32285: THOR-505: Disable (turnoff autostart) of unused subsystems
              32286: Fix NPE in AnalyticsProperties when empty json provided
              32287:  THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages"
              32289: Miscellaneous changes to account types & classes.
              32290: Change "recent activities" email notification interval from hourly to daily
              32292: Resolve THOR-516: Check all email template URLs point to cloud.alfresco.com not www.alfresco.me
              32293: THOR-517. Insert Signup Analytics Event into Site Invite process.
              32305: Fixed THOR-306 "Invite user autocomplete not working correctly"
              32308: THOR-529: Red "No items" in doc lib when adding 1st document into a x-network site (WebDAV error in log)
              32309: Fixed THOR-306 "Invite user autocomplete not working correctly"
              32314: THOR-520: Change workflow in tooltip text to task
              32318: THOR-532: Improve auto-generate of home site shortname (in case of clash)
              32339: Updated analytics events to include  parameter
              32342: Additional debug logging as part of THOR-544.
              32376: THOR-574: Accept invite while logged in displays 'you've declined...' message
   48163: Merge CONV_V413 to CONV_HEAD
        46713: Set Maven version in POM files to 4.1.3-CONV-SNAPSHOT
        46741: Deploy SPP jar file (aka VTI) into Maven repository as well
        47440 RECORD ONLY: Declare dependency on Surf 1.2.0-SNAPSHOT in Maven poms
        47450 RECORD ONLY: Bring Chemistry OpenCMIS libs back into the wars
        47579 RECORD ONLY: Switch Chemistry OpenCMIS version to a custom 0.8.0-20120706
        47646: POM dependency: use 4.2-min version of netcdf rather than 4.2, which embeds an old commons-codec
        47683: Create a jar holding the sharepoint config, for use with CLOUD2
        47740 RECORD ONLY: Merge V4.1-BUG-FIX to CONV_V413
           46360: ALF-17697: Create proper source jars, to deploy to Maven repository
        47964: Filter servlet-api from dependencies
   48166: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        47064: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35827: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32446: Fixed THOR-658 "File Upload Limits"
              32455: Tweak logging (S3 exists check -> debug)
              32462: Move tenant enabled check from low level services to web script entry point:
              32467: THOR-666: Improve startTenants - do not need to re-update enable/disable flag on startup
              32474: JMeter test script updates (#3)
              32485: Fix to ensure the HTML upload POSTed response can return html content type.
              32486: JMeter test script updates (#4)
        47084: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35828: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32491: Fix account signup since change to tenant authentication (which is now slightly stricter:
              32518: Fix for mixed cased usernames login problems
              32523: Add db pool validate query
              32546: Minor - remove unecessary call to getObjectDetails (to avoid calling twice for non-existent object)
              32556: Fixed tenant url edge cases and followed up a fix started by DavidC for signup logins
              32560: Fixed tenant url edge cases and followed up a fix started by DavidC for signup logins - part 2
           35829: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32571: Resolve THOR-653: Uploads consume disk space in /var/cache/tomcat6/
              32572: Fixed THOR-563 "UI: CSS / layout issue on profile page"
           35830:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32577: THOR-682: refactor Tenant/S3 routing content store (it is now self-routing based on S3 content url)
              32580: Added missing init-method attributes to key CachingContentStore components.
              32583: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                   32321: ALF-11700: Possible to generate feed entries with malformed NodeRefs
              32593: THOR-688 Analytics to support various URLs not just "website".
                  Addition of optional sourceUrl paramater to account-signup analytics.
              32603: Added file size limitation and hooked in html upload to the form validations w backgrounds and tooltips.
              32629: THOR-199: Fix create user (activate) sometimes has to retry - due to: "Deadlock ... alfresco.permissions.insert_AclMember-Inline"
              32654: THOR-692: Disable (auto) home folder creation
           35831: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32661: Latest SpringSurf libs: 
           35832: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32666: Build: add cloud/cloud-share to ant clean-modules/clean
              32672: Ensure that application context is available for TenantAlfrescoAuthenticator in TenantUserFactory
              32675: THOR-536: Added TenantPageTypeViewResolver
              32686: JMeter test script updates (#5)
              32700: THOR-689: DevTest: 2 uploads failed (out of 10000) - missing retry ?
           35844:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32702: JMeter test script update
              32718: THOR-691: Feed Notifier sends emails on startup of Server
              32756: Fixed THOR-556 "Can't view members in a public Site"
           35845: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (+ resolved conflicts w/ 4.0.1)
              32032: THOR-370: Add tenant-switching to /cmisatom (OpenCMIS-based v4.x impl => AlfrescoCmisService)
           35846: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32759: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1
                      32757: Fix for ALF-9365
              32761: Changed restricted tenant to appear as page not found
              32763: THOR-792: Ensure that failed login returns to login page
              32769: Updated networks icon
              32770: Authentication updates: Unauthenticated requests to inaccessible tenants (either that don't exist or not authorized to access) will be prompted for authentication and if credentials are valid the "Page Not Found" page will be shown, but authentication will have completed and user can return to their home dashboard via link provided
              32785: Fix for THOR-798
              32789: THOR-796: reduce startup time (1000s of tenants)
           35847: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32790: THOR-480: Spring Surf lib updates - ensure that i18n properties extensions degrade the specificity of the locale to ensure that no message keys are shown (unless the message genuinely doesn't exist)
              32798: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: (fix for THOR-721)
                   32245: Unit tests for ALF-10343, with the problematic parts commented out pending a fix
                   32251: ALF-11664 site.public.group (via SysAdminParams.SitePublicGroup) should be used when updating site visibilities, as it is for creating sites
           35848: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32805: Latest SpringSurf libs:
        47085: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35849: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32807: Fixed invalid network switching URLs
              32808: Updated Spring Surf libs to that revert invalid changes to relativeUri determining method
              32837: Set Alfresco connector reconnect timeout to zero
              32856: Fix for THOR-801. Trying to access the archive as 'admin' gives error.
           35850: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32858: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 
                 (pull in some pre-reqs for cleaner merge of ALF-10826)
                 31864: ALF-10686 - Original modification date is lost when files are copied into Alfresco via CIFS
                 31934: Update stale File State Cache.
                 32068: ALF-10941 - CIFS Open file from excel
                 32097: build fix.
                 32131: ALF-10902 - No friendly notification occurs when Editor or Collaborator tries to delete content
                 32132: Open read-only for attributes only.
                 32182: ALF-10963      Cannot overwrite files on CIFS share with Notepad++
              32876: THOR-784: Fix 'Accounts API loading is very slow' (get page of accounts)
              32939: THOR-480: Latest Spring Surf libs - fix i18n extensibility problems.
              32948: THOR-859: Performance: Disable rules service
              32953: THOR-863: Performance: loadUserByUsername -> isAdminAuthority
              32959: (RECORD ONLY) Merged HEAD to DEV/THOR1
                 32958: (record-only) Merged Dev/THOR1 to HEAD
                    32945: Fix for ALF-12122 Some CMIS queries with SOLR are not returning correct results
           35853: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33024: Fixed THOR-670 "Incorrect window title for 'Task History' page"
              33027: Missing merge info for r32694
           35854: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
               33033: Latest SpringSurf libs:
           35855: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33038: Minor: do not bootstrap web script readme x2 into Data Dictionary (when creating tenant)
              33039: Resolve THOR-839: Following webscripts doesn't set Content-Type response header
              33040:  Fixed THOR-817 "Issues with "invite user" email autocomplete field"
              33041: Fixed THOR-789 "Mix of languages"
              33042: Resolved THOR-849: Upload issue ? - Failed to get content ... (No such file or directory) ... x22
   48169: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47176: (RECORD ONLY) Fix Eclipse .classpath to match Spring Surf libs
   48170: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        48168: CONV: Fix NPE in get people CQ
   48183: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47184: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                35989: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                     34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti)
                     34161: Prevent session timeout redirect problem resulting from clicking user link in activities feed
                     34183: Part one of THOR-1129.
                     34185: Part two of THOR-1129. The Thor-specific parts.
                     34199: Fix for THOR-106 a failing test case that was switched off.
                     34202: THOR-106 addendum. Editing build.xml to put the test class back in to the build.
                     34211: BM: sync ThorTest (additional coverage)
                     34308: Merged HEAD to THOR1_SPRINTS
                          34250: Fixed THOR-1137 "Make Spring Surf enable-auto-deploy-modules by default"
                     34540: Share UI - copyright should be 2012 (related to THOR-1015)
                     35286: Resolve THOR-1242: Update Beta Logo
   48187: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        47086: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35860: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33057: Refactored Slingshot overrides so that they are now in the Thor-Share private module. This has been done to reduce conflict issues when merging back into HEAD.  The overrides are now in the correct locations (the only files that could not be moved to the private module are urlrewrite.xml and surf.xml).
           35870: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (part 1 - repository project)
              33022: THOR-662: Email templates should load/resolve (initially) from classpath
           35877: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33090: ALF-10826: hidden aspect
              33091: THOR-416: fix surf-config folder (appears where it shouldn't)
              33093: Sweep through email templates.
           35881: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33104: Tweak to invitation email template
              33112: Refactored impl of THOR-694 so that content limit of 25Mb is on by default in THOR for both local FS and S3-based FS.
                 Changed ContentLimitProvider bean to take String limit, rather than long - to allow empty string value on core Alfresco.
                 Set the limit to the empty string in core Alfresco, which means 'no limit'.
                 Applied the limit always.
                 Set the limit to 25Mb in Thor/alfresco-global.properties
                 Fixed a minor bug in error reporting due to previous exception renaming.
           35885: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33134: THOR-874: Updated Surf libs Fixes ArrayIndexOutOfBoundsException caused by multiple threads apply i18n extensions to a WebScript
              33135: Missing WebScripts sources JAR from r33134
              33153: Resolve THOR-551: Password Hashes Need Review
              33154: Update to latest email blacklist
              33155: Fixed THOR-534 "Login Box shows scroll bars"
              33156: Build fix for tests failing due to recent password changes
              33157: Build fix for updated email blacklist
              33172: THOR-776: Re-implement Share override as guided by Erik
              33173: THOR-831: Text in Someone
        47096: Fix merge compile issue
        47100: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35906: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33054: THOR-796: slow startup time (on QA env with ~ 10k tenants)
              33055: Implementation of THOR-694. File size upload limit within ContentStore.
           35907: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33213: THOR-833: wip
              33214: Allow for workflows which may have a reference to a repo based email template
              33228: Added extension points for links in user profile toolbar
              33230: Added extension points for links in user profile toolbar part 2
              33232: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships"
              33233: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 2
              33234: Extension points in members bar now ft the pattern of user profile toolbar.
              33236: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 3
              33241: THOR-908 - wip
              33243: THOR-908 / THOR-64 - wip
              33253: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 4
              33255: Fixed THOR-907 Remove Share functionality which allows access to people profiles outside of your site memberships part 5
        47169: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35913: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33410: Merged form THOR1_SHARE_PERFORMANCE to THOR1_SPRINTS
                   33111 Branch for testing out new Spring Surf client side resource improvements
                   33291 Share client side resource handling to avoid stale client side cache part 1
                      - New spring surf libs with <@script> & <@link> directives that adds the checksum of the file to avoid client cache beoming stale
                      - Refactored most old <script> to become <@script>
                      - Refactored most old <link> to become <@link>
                      - Removed old <@link> macro from alfresco-temaplte.ftl, resources.get.html.ftl & corm-console.ftl (now using the directive instead)
                      - i18n messages now imported by <@generateMessages> directive to avoid stale cache
                      - Added calendar, cookie, resize & uploader yui modues to yui common to decrease the number of .js files requested
                      - Added new YUI module filter that adds "-min.js?v=<YAHOO.VERSION>" to stop a yui resources being stale after a yui upgrade
                   33307 Share client side resource handling to avoid stale client side cache part 2
                      - Made TinyMCE avoid becoming stale after a new release
                   33334 Share client side resource handling to avoid stale client side cache part 2
                      - New surf libs with <@checksumResource> directive used by ie6.css, ie7.css, ipad.css & tiny_mce.js to avoid manual change of version number in script import
                   33368 Share client side resource handling to avoid stale client side cache part 3
                      - Avoiding re-load of .js, .css & images (referenced from a .css) when switching tenants (note images that have been referenced using <img src=""> will get reloaded)
                   33405 CSS import duplication fix
           35914: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33417: Thor JMeter test script tweaks
              33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
              33434: The <#if> statement & <script> element for google analytics wasn't in sync, causing a closing </script> element always being printed.
              33440: Latest SpringSurf libs - performance and thread safety improvements.
              33458: ThorTest-preReg (JMeter) test update
              33460: Latest SpringSurf libs:
              33466: THOR-1002: Updated enterprise overlay
              33480: Latest SpringSurf libs - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
           35915: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33493: THOR-979: HTML5 upload support
              33505: THOR-983: Preload images, JS and CSS for basic dashboards, document library and document details (from login page)
              33518: THOR-979: HTML5 upload tweaks (upload doesn't start automatically when updating to give opportunity to set version type and add comment
              33520: THOR-900: Modified header.get.html.ftl to ensure that user name is URL encoded (so that the "@" symbol in the user name becomes "%40" to ensure that timeout redirects work)
              33527: THOR-1027: Header Alfresco image now links back to application context and about dialog is now linked from footer Alfresco image
              33551: THOR-1007: Fixed upload hang on FireFox when uploading folders
           35916: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33556: Merged BRANCHES/DEV/THOR1_INVITATION to BRANCHES/DEV/THOR1_SPRINTS:
                   33386: Branch for Invitation enhancements
                   33474: THOR-1006. Part 1. Services-level changes to support invitation enhancements.
                   33475: THOR-1006. Documentation on the desc.xml.
                   33476: THOR-1006. Commenting out some unfinished code to avoid any unwanted side-effects.
                             Still to do: get the authentication check working and ensure no unexpected side-effects.
                   33483: THOR-1006. Completion of basic services changes to support 'accept invitation on alternate email'.
                       Note! The authentication of the alternative email's password is NOT YET IMPLEMENTED due to a repo
                             dependency. This MUST be implemented before merge to THOR1_SPRINTS. I'll create a new JIRA.
                   33511:  Fix for THOR-1017.
                   33525: THOR-1017. Slight improvement to desc.xml doc. HTTP status codes in response.
                   33529: Fixed THOR-980 & THOR-1024 & THOR-1025
                   33553: Fixed THOR-980 "F14: Allow users to login using existing email address if invite is sent to wrong email address and they already have an account"
              33571: Fixed HTML5 uploader to work with profile avatar image upload
              33585: Thor JMeter test script tweaks
              33596: THOR-1035: Enabled HTML5 uploader for application logo upload
              33598: THOR-1031: Reduced HTML5 checks for uploader to ensure that it works for Safari on Mac
              33603: THOR-1039: Updated UX for HTML5 upload when 0kb files are selected
              33606: THOR-1037: Updated variable titles for HTML5/DND upload dialog to support update
           35917: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33615: Latest SpringSurf libs - performance and concurrency improvements
              33690: Resolve THOR-1003: Forgotten Password email is case sensitive
              33692: Merged BRANCHES/DEV/THOR1_PRIVACY to BRANCHES/DEV/THOR1_SPRINTS:
                   33488: Reversed merge revisions related to THOR-907 - 33232, 33233, 33236 - hand tweaks related to 33253, 33255.
                   33492: Removed unused import of com.sun... class
                   33497: Fixes and improvements to user profile page loading - reducing remote calls required and refactoring link build code. Fixed a issue with displaying the Following link on other users profile page.
                   33506: THOR-1020: people visibility
                   33509: Reduced remote calls required to build user profile page.
                   33519: THOR-985, THOR-986
                   33542: THOR-989 - Added extensibility hooks to People Finder component
                   33558: THOR-1014: Profile visibility -1st cut for THOR-993 (/api/people)
                   33564: THOR-1014: Profile visibility - THOR-992 (/webframework/content/metadata?user=)
                   33569: Implemented THOR-985, THOR-986, THOR-989
                   33572: Performance improvement to remove the need for a share->repo call for each page or ajax request to resolve account class name.
                   33579: THOR-1020: cloud people API (re: visibility)
                   33599: Share Thor performance improvements - removed the need to call /internal/cloud/current-user inside various common components - now using cached data in user object.
                   33608: THOR-1014: Profile visibility - fix PeopleRestApiTest
                   33625: THOR-1020: people visibility
                   33632: THOR-984 - Hide Account Settings screen from External Users.
                   33636: THOR-1014: profile visibility
                   33670: THOR-1020/THOR-1014: people/profile visibility
                   33674: THOR-1047: Privacy REST - subscriptions (follower) API
                   33688: THOR-1047: Privacy REST - subscriptions (follower) API
              33696: Fix for THOR-785 "F272: API call to get the number of accounts"
              33698: THOR-1033: Fixed free accounts showing console settings (updated Spring Surf libs)
              33700: Committed other Surf updates missing from r33698 (WebScript JARs) to ensure that manifest meta-data isn't misleading
              33705: THOR-1052: VersionService: ensureVersioningEnabled
              33706: Merged BRANCHES/DEV/THOR1_UPLOADLIMITS to BRANCHES/DEV/THOR1_SPRINTS:
                   33510: (RECORD ONLY) File Upload Limit enhancements
                   33656: Account Quotas / File Upload limit pt1
                   33686: Modified dnd-upload and html-upload WebScripts to retrieve maximum upload size from internal service (and refactored core WebScripts to support override)
              33710: THOR-1020: Privacy (People REST API)
              33713: THOR-1020: Privacy (People REST API)
              33718: THOR-1020: Privacy (People REST API)
              33722: Thor JMeter test script
              33742: Latest SpringSurf libs - performance improvements and concurrency fixes
           35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33764: THOR-1021: F287: Account Types can define file size upload limits for the Account which are set when the account is upgraded/downgraded between Account types
              33767: Tweaked HTML5 upload dialog so that error messages are handled gracefully
              33785: Resolve THOR-457: Already have an account email template needs updating/fixing
              33786: Fix to issue spotted by DaveC where switching networks would not correctly refresh user metadata. Also fixed minor encoding issues in related Networks WebScripts.
              33792: Merged BRANCHES/DEV/THOR1_PUBLIC_EMAIL to BRANCHES/DEV/THOR1_SPRINTS:
                   33490: Initial feature branch
                   33535: Fix to unreported issue whereby DirectoryService.getDefaultAccount returns the home account.
                   33547: THOR-176. Invite new user (public domain email address) into site. Part 1.
                   33592: Further work for THOR-176. user metadata REST API now does not return homeTenant if the user is from a public email domain. This conditional removal of the 'homeTenant' JSON property is needed by Share.
                   33593: THOR-176. Refactor of UserTenant to use AccountClass to check isPublicEmailDomain.
                   33620: Fix for NPE in UserTenant.isPublicDomainUser(). The admin user has no account-type.
                   33627: Share updates for public e-mail
              33797: THOR-176: consolidate public domain check
              33802: Remove temporary option to use double @ login (as per THOR-156) - no longer required
              33804: Removed locale from the cachekey used for tenant page view cache.
              33810: Merged BRANCHES/DEV/THOR1_BLACKLIST to BRANCHES/DEV/THOR1_SPRINTS:
                   33709: Blacklist CRUD: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 (Part 1 - DAO layer)
                   33711: Blacklist CRUD: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 (Part 2 - Foundation Service layer)
                   33747: THOR-974, THOR-975, THOR-976, THOR-977 and THOR-978. REST API for CRUD of blacklisted email domains.
                   33809: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 Adding REST-client rcq files for blacklist CRUD.
           35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33814: Merged BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS to BRANCHES/DEV/THOR1_SPRINTS:
                   33411: (RECORD ONLY) Thor account settings branch from Thor1_Sprints.
                   33607: Initial checkin for THOR-972, THOR-971, THOR-410
                   33621: THOR-972, THOR-971, THOR-410 - added missing files
                   33639: THOR-971, THOR-972, THOR-410:
                        - add paging properties to the list people web script
                        - default network admin to true and internal to null
                   33641: Second cut of THOR-964 "F173: Network admin can list users of network (with paging support)"
                   33642: THOR-972, THOR-971, THOR-410 - changed paging properties in list users
                   33652: Implemented THOR-964,THOR-965,THOR-965,THOR-966,THOR-967,THOR-968,THOR-969
                   33653: User action click event now stopped so it doesn't modify the url
                   33671: THOR-971: webscript implementation
                   33687: Making premote/demote available for network-admins and not only for admins. check for network admin role already exists in the service code.
                   33694: THOR-971:
                       - Added analytics handling
                       - Fixed invite share url to include tenant
                   33699: THOR-963    "F17: Network admin can add a one or more internal users to their network"
                   33702: THOR-971:
                        - changed the bulk create url
                        - changed the activate email template
                   33703: Make sure Java-based network admin scripts set the response status to 401 if the authenticated user is not a network admin
                   33737: THOR-410:
                       - more unit tests
                       - tidy up
                   33744: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_USER_MANAGEMENT to BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS:
                        33417: Thor JMeter test script tweaks
                        33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
                        33434: The <#if> statement & <script> element for google analytics wasn't in sync, causing a closing </script> element always being printed.
                        33440: Latest SpringSurf libs - performance and thread safety improvements.
                        33458: ThorTest-preReg (JMeter) test update
                        33460: Latest SpringSurf libs:
                        33466: THOR-1002: Updated enterprise overlay
                        33480: Latest SpringSurf libs - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
                        33493: THOR-979: HTML5 upload support
                        33505: THOR-983: Preload images, JS and CSS for basic dashboards, document library and document details (from login page)
                        33518: THOR-979: HTML5 upload tweaks (upload doesn't start automatically when updating to give opportunity to set version type and add comment
                        33520: THOR-900: Modified header.get.html.ftl to ensure that user name is URL encoded (so that the "@" symbol in the user name becomes "%40" to ensure that timeout redirects work)
                        33527: THOR-1027: Header Alfresco image now links back to application context and about dialog is now linked from footer Alfresco image
                        33551: THOR-1007: Fixed upload hang on FireFox when uploading folders
                        33556: Merged BRANCHES/DEV/THOR1_INVITATION to BRANCHES/DEV/THOR1_SPRINTS:
                             33386: Branch for Invitation enhancements
                             33474: THOR-1006. Part 1. Services-level changes to support invitation enhancements.
                             33475: THOR-1006. Documentation on the desc.xml.
                             33476: THOR-1006. Commenting out some unfinished code to avoid any unwanted side-effects.
                                          Still to do: get the authentication check working and ensure no unexpected side-effects.
                             33483: THOR-1006. Completion of basic services changes to support 'accept invitation on alternate email'.
                                 Note! The authentication of the alternative email's password is NOT YET IMPLEMENTED due to a repo
                                       dependency. This MUST be implemented before merge to THOR1_SPRINTS. I'll create a new JIRA.
                             33511:  Fix for THOR-1017.
                             33525: THOR-1017. Slight improvement to desc.xml doc. HTTP status codes in response.
                             33529: Fixed THOR-980 & THOR-1024 & THOR-1025
                             33553: Fixed THOR-980 "F14: Allow users to login using existing email address if invite is sent to wrong email address and they already have an account"
                        33559: Initial feature branch
                        33669: First cut of THOR-994 and THOR-995 - remove internal and external user from network.
                        33685: Making remove-external-user.delete.desc.xml accept a domainName templateArg as well as the existing accountId.
                        33716: THOR-994 and THOR-995. Remove user from network.
                            Addressing some review comments from DaveC. Refactoring mostly.
                            Also added protection on RegistrationService.deleteUser() to prevent deletion of last NetworkAdmin in network.
                   33745: Adding NetworkdAdmin protection to the remove-external-user.delete webscript.
                   33752: Additional fixes for THOR-966 & THOR-969
                       * Improved messages/dialogs: demoting yourself, demoting last admin, removing last admin
                       * New User Button align layout fix as requested by Imran
                   33754: Documentation for the remove-external-user.delete webscript.
                   33756: THOR-410:
                       - unit test tidy
                   33766: Fix for signup link when already logged in as another user
                   33769: THOR-963 "F17: Network admin can add a one or more internal users to their network"
                   33770: Ensure a 403 is returned (rather than 500) when attempt is made to remove last NetworkAdmin in a tenant.
                   33774: Added padding on top of name for the Manage Users screen as requested by ux
                   33790: Promote/demote icons from Imran
              33815: Fix issue with removal of public email user from last invited network
              33817: THOR-1060: Activities Feed - perf tweak to halve the number of generated feed entries
              33819: THOR-1060: fix ActivitiesFeed subsystem (re-)name
              33820: Merged BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS to BRANCHES/DEV/THOR1_SPRINTS:
                   33756: THOR-410:
                       - unit test tidy
                   33766: Fix for signup link when already logged in as another user
                   33769: THOR-963 "F17: Network admin can add a one or more internal users to their network"
                   33770: Ensure a 403 is returned (rather than 500) when attempt is made to remove last NetworkAdmin in a tenant.
                   33774: Added padding on top of name for the Manage Users screen as requested by ux
                   33790: Promote/demote icons from Imran
              33825: People REST API
           35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33850: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
                   33843: Fix for ALF-12775
              33866: Fix for THOR-1071
              33878: Fix the build
              33881: THOR-1069: Ensure that invitations can be accepted when a user is already logged in
              33882: Resolve THOR-1082: Possible to register email address with invalid domain (according to our tenant id rules)
              33883: Resolve THOR-1070: External user's avatar not displayed on the People Finder page.
              33884: Fix solrcore.properties
              33899: Resolve THOR-1077: Incorrect free space displayed when uploading files which exceeds quota
              33922: Resolve THOR-1079: Incorrect behavior of the button "Save and close" to "Send Document (s) For Review" tasks.
              33933: Resolve THOR-1088: Hide Account Id from Account Summary Screen
              33934: Resolve THOR-1089: Review Account Quota text on Account Summary Screen
              33942: Fix for THOR-1094. InvalidDomains FTL couldn't handle NULL notes field.
                  This shouldn't arise in the field as we don't put NULL-valued notes in the DB, but it might matter in some test envs.
              33949: Resolve THOR-1093: Incorrect notification title displayed when trying to invite user from another network from Manage Users page
              33953: Fix for THOR issue where public users should not be able to see Following and Following Me tabs in their own profile.
           35954: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              34140: THOR-1098: Prevent resources being requested twice (latest Surf libs)
              34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti)
              34161: Prevent session timeout redirect problem resulting from clicking user link in activities feed
           35960: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              34224: Fix for THOR-789 - Mix of languages. The original bug was not never actually completely fixed, added some additional handling in SpringSurf WebScripts View to not override the locale from the original request parameters if it has already been set elsewhere.
              34301: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                   34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
              34343: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                   34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix
                   34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix
              34388: THOR-953/SYS-294: add db.pool.evict.num.tests option (=> numTestsPerEvictionRun)
              34729: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                   31867: Merged DEV/TEMPORARY to V3.4-BUG-FIX
                        31400: ALF-10764: PDF vs 1.5 cause crash jvm
                           - PDFRenderer library has been updated from 2009-09-27 to 0.9.1 version to support PDF documents of 1.5 version
                   32061: ALF-11376 Requesting PDFBox 1.6 be included in future service pack release.
                        Upgrading pdfbox,fontbox,jempbox from 1.5.0 to 1.6.0
              34731: THOR-1261: repo cluster fix (propertyUniqueContextCache)
              34734: THOR-1261: repo cluster fix (propertyUniqueContextCache)
              34435: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                   34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode)
           35961: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              34558: THOR-1216: tenant context mismatch (Solr tracking)
              34606: THOR-1216: tenant context mismatch
              34441: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
                   33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component)
              34489: Fix to remove hazelcast subdir from build.xml for -exploded build - Thor specific merge issue.
              34722: Added hazelcast-cloud jar to allow AWS Hazelcast config options for Share clustering on Thor
              34848: THOR - specific version of ClusterAwarePathStoreObjectPersister.
              34931: Thor specific lookup of Share custom app context files to include the custom-slingshot-cloud-context and custom-slingshot-application-context only and in the order we want. Also updated Hazelcast example config to include AWS by default
           35962: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              34940: THOR-1288: Extra diagnostics for tracking leaked tenant context on thread:
              34187: Updated Surf libs (down grades duplicate dependency warnings to debug info)
              34410: THOR-1169: Latest Spring Surf libs to fix missing template CSS probs
              34418: (RECORD ONLY) Merged BRANCHES/DEV/BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/BRANCHES/DEV/THOR1_SPRINTS
                   34316: Method signature change to ConfigService fixes for RepoXMLConfigService
              34471: (RECORD ONLY) Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS
                   34468: Fix for ALF-13172
                      Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
                         34467: Fix for ALF-13237 - Change dashboard Layout is not working correctly, original layout is still used after saving changes.
              34891: Added missing jug-asl-2.0.0.jar to slingshot deps for Thor
           35963: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              35087: Minor: remove NOOP (introduced in r30776)
              35123: THOR-1288: update leak logger
              35124: THOR-1288: prod login failure when using cloud console for (bulk) signups
              35132: THOR-1288: build/test fix
              35133: THOR-1288: build/test fix
              35395: Resolve THOR-1340: Alberto.Vazquez@w.illi.am cannot sign up
           35964: Spring Surf library refresh
           35995: Fix merge issue
           35999: Fix merge issue
           36053: 1st pass at upgrading to latest Spring Surf
           36059: Fix CloudInvitationService tests for cloud1
   48191: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47185: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             MT - enable ability to get call context if overriding of beginCall/afterCall
             - eg. for cloud use-case (x-network switching)
   48192: Temporarily disable generation of installers, to speed up build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-03-18 09:52:08 +00:00
Dave Ward
811519ae48 Merged V4.0-BUG-FIX to HEAD 
33116: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935.
   33136: Fix for ALF-12200: "Content type is not recognized on creating document from source"
   33137: Activities feed generator: change info log messages to debug log messages
   33139: ALF-12262	View in Source Repository works incorrect if the folder was created on target side at first
   33141: Fix for ALF-12178 "Bulk import - status page shows broken link (Initiate another in-place import)"
   33144: Fixes ALF-11119: The 2 tranformations didn't work - Segmentation fault in ffmpeg - it looks like a bug with ffmpeg and it was decided that compile/bug fixing ffmpeg is not a priority at the moment.  The 2 entries have been commented out.  If they are required, the user should consult the ffmpeg documentation for the correct version & o/s at the time.
   33146: ALF-11345 Patch from Pavel Yurkevich to fix another VTI/SPP problem with site names that start with Alfresco
   33147: FTP implemented set modification date/time command (MFMT). ALF-12105.
   33148: ALF-12063 Pull some of the VTI list type definitions out to a common base class
   33150: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33076: ALF-12285: Allow dumping of schema to XML via JMX
   33151: Fix problems with FTP and UTF-8. JLAN-81.
   When using the Java6 Normalizer use the NFC form.
   33158: Fix NFS server swallows exceptions. ALF-11667.
   Startup exception details are now saved.
   33160: Improve the Vti/SPP exception message for the case of the Vti port being already in use
   33161: ALF-12063 Additional SPP/Vti list info required for Mac Office 2011 support
   33162: Fixes: ALF-10322: Edit Dialogue gets out of sync if event moved using FullCalendar (extends FullCalendar to provide a callback after an event changes, which enables us to keep our event object up to date).
   33163: Fixes: ALF-10248: Grey Placeholder image for unauthorised channels has now been replaced with yellow one.
   33164: Fixes: ALF-11562; Refactors My Calendar dashlet to use timezone aware ISO8601 dates from updated Calendar API & removes obsolete properties from userevents calendar API
   33165: Fixes: ALF-10645; i18n label doesn't appear in property bundle.
   33167: Fix for ALF-11970
   33168: Fix for ALF-10565 "Category manager in admin console needs query not search"
     - i18n'd the strings
   33178: Publishing: Fixes: ALF-11552; Inline edit icon alignment issue fixed
   33183: Minor fix to exception string in extendBuffer().
   33194: ALF-10545: NodeServicePolicies#onUpdateNodePolicy not adequate for NodeService#setType
      * Added beforeSetNodeType and onSetNodeType policies
      * Both callbacks have old and new types as parameters
   33204: Fixes: ALF-11230, publishing tracking link opens in repository, not Doc Lib. Also fixes a couple of other minor bugs:
      - balloon pop up didn't appear when published from Doc Details page
      - tracking link appears black (on black) when hovered over.
      - adds defensive code to prevent an error if the expected element for the notification balloon isn't there.
   33212: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33211: ALF-12384: Failed schema dump can cause failure of repository start up
   33217: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation
      31987: Proper fix for ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6
         - Just handle missing defined ACLs   
      32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements
      32911: Add a (currently disabled) unit test for ALF-10466 - The HTML to Text transformer (not Tika based) should take account of the content encoding
      32912: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX with changes + unit testing:
         31742: ALF-10466 - The HTML to Text converter needs to take account of the Encoding set on the Content Property, to be able to correctly index MBCS text in wiki pages (and others)   
      32946: ALF-12161: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
         32921: Merged DEV/TEMPORARY to PATCHES/V3.4.5
            32913: ALF-11440: Content Manager unable to edit content from another user sandbox
               In order to allow a Content Manager to edit a locked document in other user's sandbox, it is needed to modify the AVMLockingAwareService.grabLock().
               The 'lockState' variable could be set to 'LOCK_OWNER', if a user is ContentManager to bypass the check.   
      32964: Fixes ALF-11054: Sharepoint - Wrong sorting by date
        - incorporated patch from investigation team
      32967: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX:
         31828: Fixes ALF-10720: Webform performance improvement
               Minimize database usage by adding new variable to FormWrapper that holds a form's name.   
      32969: Fixes ALF-10471: Cannot correctly remove users from email notification rule list
      32980: Merged DEV/TEMPORARY to V3.4-BUG-FIX
         32961: ALF-12132: Set "common-placeholder-configurer" as parent for "lotusWSPlaceholderConfigurer" bean.    
      32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded
      - Fixes regression introduced by r31972 / ALF-11489
      33068: Added suggested fix to commit any current transactions in the NFS file expiry thread. ALF-11827.
      33077: ALF-10142: Allow TinyMCE to accept <meta> element when editing HTML files inline in Share.
      33094: Fix for ACT #15024-37148 (no JIRA yet)
       - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers.
      33118: ALF-12278: Prevent the copying over of headers specific to a POST request on to the touch GET request   
      33138: Upgraded SpringSurf to 1.0.0 rev 968
      33140: Added missing json-simple jar to 3rd party eclipse classpath, which bizarrely is used to generate the JUnit cmd line unit test classpath, no really.
      33145: Fix for native FTP timestamps returned in GMT timezone format. ALF-11986.
      33175: ALF-12366: Cope with read committed DB behaviour in AbstractReindexComponent.reindexTransaction()
      33179: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7
          - Being done in 3.4.8 not 3.4.7
      33190: Latest SpringSurf libs:
       - much improved handling of multiple connections and connection reuse in RemoteClient
       - improves connection reuse generally, but also much more stable under load balancing condition with multiple Share web-tiers behind a reverse proxy
      33193: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7
          - Found a few more having followed previous date changes and searches
      33203: Fix for HttpClient issue: Error status 500 Unbuffered entity enclosing request can not be repeated.
      33206: Fix to FormUIGet - no need to manually patch up the JSON request since rev 33138 (SpringSurf 1.0.0)
   33218: Fix for ALF-11868 "CMIS: removeAcl() function doesn't work via atompub."
   33220: Merged PATCHES/V3.4.6 to V4.0-BUG-FIX
      32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24)
         32404: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
            Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite
         32397: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
            Return first 200 invitations (similar to 4.0 paging)
            Transaction used by the invites.get is now read only so does not force a flush of caches.   
      32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1
         32501: ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources!   
      32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally
      32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         Even more changes:
         - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible)
         - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows
         - modified js which was making a query for each person in order to work out if they were already in a pending invites list
      32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
      - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site)
      - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors
      - Performance implications still to be checked but at least functionally correct
      - Corrected JPDL source jar
      32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 
      32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
      - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects
      32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
      - Rationalization of batch fetching at hibernate layer
      32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation().
      32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks()
      32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out
      - Pending invitation workflows are cancelled in an asynchronous action
      - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate
      - Creating the rows in the first place took 20 minutes!   
      32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks
      - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete
      33169: ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF
         - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently
           only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows.
   33221: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      30463: L10N Updates from Gloria (based on r30332): Fixes ALF-8211 and new string updates
      30473: Merged HEAD to V3.4-BUG-FIX
         30468: Fixed ALF-10280: Slow to report ® Duplicate entry ¯ in database.
                - DuplicateChildNodeNameException implements DoNotRetryException   
      30685: Merged HEAD to V3.4-BUG-FIX
         30679: Unit test for ALF-1017 - Non site content in the Sites Space
         30683: ALF-1017 Remove EVERYONE Contributor permissions from /Company Home/Sites/, to avoid misc nodes being created in there by mistake by users, and update the SiteService to runAsSystem when creating the Site node   
      30693: Merged HEAD to V3.4-BUG-FIX
         30692: Fix ALF-1017 specific test following ALF-1017 changes to permissions   
      30808: Fixes: ALF-10485 (minor text update)
      30873: Latest L10N update from Gloria (based on r30698):
         - Adds Web Quick Start translations (back port from 4.0)
         - Adds/updates new or previously missing strings
      31019: Merged HEAD to V3.4-BUG-FIX
         28974: added double-checks for associations when a potential failure is detected
         31018: Fixed ALF-9591: Integrity check: Association source multiplicity checking is incorrect
                - Drop checks for source multiplicity when no associations are pointing to a type/aspect instance   
      31045: Merged HEAD to V3.4-BUG-FIX
         31044: Performance improvements for PATH queries relating to Share dashboard dashlets and document library.
                - tweaks to generation of PATH queries - hugely improves performance when dealing with 1000's site memberships
      31160: Merged HEAD to V3.4-BUG-FIX
         31156: Various Share search related fixes as spotted by Andy:
                - increased resultset size that is used to retrieve raw results from query before Share specific results are filtered - this means sensible results are now shown from large repository wide and sorted queries, previously results would be "missing" if they dropped out of the resultset prefiltering
                - fix to Share Search component to correctly display if more than N results were found in the repository
                - fix to add default TYPE clause to generated Share search if no other TYPE is specified - this reduces masses of potentially matches results from repository wide searches that would otherwise need to be post-filtered
      31345: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX:
         31330: Fixed WCM bulkImport's importDirectory
      31442: Merged HEAD to V3.4-BUG-FIX
         31441: Fixed ALF-11014: Content output stream close errors are absorbed silently
                - Found while testing XAMcontentStore
                - Pulled stream copy code into AbstractContentWriter
                - OutputStream closure (write-side) exception is rethrown to allow full rollback, etc   
      31444: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX:
         31383: MLPropertyInterceptor performance improvements:
      31758: Merged V3.3 to V3.4-BUG-FIX
         31757: ALF-11279: Fixed RetryingTransactionInterceptor so that it actually behaves like an interceptor and doesn't throw away the rest of the interceptor chain!   
      31798: Merged V3.3 to V3.4-BUG-FIX
         31773: ALF-11279: Further RetryingTransactionInterceptor fixes - must do mark for rollback on propagating transactions   
      32051: ALF-7195: Merge HEAD (4.0) to V3.4-BUG-FIX (3.4.7)
         Merge was simply to take HEAD version to pick up changes made by Derek to DisableAuditableBehaviourInterceptor
         32047: ALF-8882 Edit Online: Modifier and Modified date are changed even no changes were applied
            - needed to turn off ASPECT_AUDITABLE on removeProperty which is called on unlock
            - added code to not enable this aspect early if nested calls were made (this is not done, but is safer this way)
      32088: Merging HEAD to 3.4-BUG-FIX:
      r32063: ALF-10947 Fixed issue where repeating JBPM timer was causing an infinite loop if an exception was thrown within the timer event.
      32475: ALF-11727 Improved performance of pending invites search.
      32512: Incremented version revision for 3.4.8
      32917: ALF-12133: Merged HEAD to V3.4-BUG-FIX
         32906: ALF-12068 - Zimbra desktop - corrected InternalDateAsString.   
      32923: ALF-12133: Merged HEAD to V3.4-BUG-FIX
         32918: ALF-12133 - Attempt 2 to get Imap internal date correct.   
      33021: ALF-9878: Merge V3.4.1 (3.4.1.25) to V3.4-BUG-FIX (3.4.8)
         32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks
         - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete
         32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out
         - Pending invitation workflows are cancelled in an asynchronous action
         - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate
         - Creating the rows in the first place took 20 minutes!
         32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks()
         32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation().
         32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - Rationalization of batch fetching at hibernate layer
         32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects
         32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 
         32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site)
         - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors
         - Performance implications still to be checked but at least functionally correct
         - Corrected JPDL source jar
         32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Even more changes:
            - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible)
            - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows
            - modified js which was making a query for each person in order to work out if they were already in a pending invites list
         32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally   
      33143: Merged BRANCHES/V3.4-TEAM to BRANCHES/DEV/V3.4-BUG-FIX
         25103: ALF-6613 - SpringSurf improvements to allow easier refactoring of Document Details page
                - removed manual request level caching of remote calls responses in web-tier components - now completely automatic
         25138: Flattening of user preferences remote calls - ensures /preferences hits the RequestCachingConnector - reduces no. of remote calls by 3 for the doclib and by 4 for a site dashboard.
      33216: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX (3.4.8)
         32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24)
            32404: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
               Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite
            32397: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
               Return first 200 invitations (similar to 4.0 paging)
               Transaction used by the invites.get is now read only so does not force a flush of caches.   
         32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1
            32501: ALF-9878 / ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources!   
         32641: ALF-12387 / ALF-11872: Merged V3.4-BUG-FIX (3.4.8) to V3.4.1 (3.4.1.25)
               32475: ALF-11727 Improved performance of pending invites search.
         	     (N Smith changes to do with only using ONE search value - faster as multiple are taken as ORs rather than ANDs)
         32650: ALF-12387 / ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally
         32775: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Even more changes:
            - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible)
            - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows
            - modified js which was making a query for each person in order to work out if they were already in a pending invites list
         32838: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site)
         - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors
         - Performance implications still to be checked but at least functionally correct
         - Corrected JPDL source jar
         32857: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 
         32861: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects
         32868: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - Rationalization of batch fetching at hibernate layer
         32881: ALF-12387 / ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation().
         32927: ALF-12387 / ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks()
         32936: ALF-12387 / ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out
         - Pending invitation workflows are cancelled in an asynchronous action
         - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate
         - Creating the rows in the first place took 20 minutes!   
         32956: ALF-12387 / ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks
         - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete
         33169: ALF-12382 / ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF
            - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently
              only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows.   
   33224: Fix for ALF-12230 "Bootstrap re-encryption failed"
   33225: Fix for ALF-12349 Transformations need to handle failures due to server being busy.
     Change to system behaviour:
       We want to support transient failures of thumbnail creations. Primary example now is the Polymorph Transformation Server which
       can fail transformations because it is under load and wishes to decline transform requests.
       Prior to this check-in, such failures would be interpreted by Alfresco as 'real' failures and the content node would be marked
       as FailedToTransform. The transformers' state data would also be affected by the failure.
       We need to allow transformers to fail and NOT trigger any negative consequences such as above.
     Changes in code:
     New exception type ActionServiceTransientException when thrown from an ActionExecuter will NOT trigger any compensating action that has been configured.
       This allows actions to fail 'normally' or due to some transient condition with the implication that if rerun later the action may succeed.
     Additional end-state for Actions in the ActionTrackingService: ActionStatus.Declined. The ActionExecuter has declined to execute the action at this time.
     New exception type ContentServiceTransientException which means that a content operation (currently only a transformation) has failed due to a transient condition.
       CreateThumbnailActionExecuter catches this exception type and throws the ActionServiceTransientException.
     Tests at the ActionServiceImpl, ActionTrackingServiceImpl and ThumbnailServiceImpl APIs & various test config & other changes.   
   33231: ALF-10581 - MySQLIntegrityConstraintViolationException: Cannot add or update a child row: a foreign key constraint fails ... fk_alf_cass_cnode
   - unexpected non-null child node id when creating a new node (see also THOR-906)
   - for now genericise ALF-10153 (to include at least MySQL in addition to MS SQL Server)
   33237: Fixing JUnit jar's src attachment.
   33238: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33222: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_
      33235: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_
   33239: partial fix for: ALF-10446 - Upgraded FullCalendar to support ISO8601 Zulu timezone & told it not to ignore the timezone information.
   33240: Implementation of improvement ALF-12404.
     This fix has been OK'd by Andy Hind.
   33246: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33244: ALF-12352: Add JMX support to trigger a schema check manually
   33252: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      33245: ALF-12366: Delete a node by deleting its row and inserting a new one with the deleted flag set
         - Forces a new ID to be generated for the deleted node
         - Makes it impossible to simultaneously delete a node and add new children in two concurrent transactions
         - Can't be merged to 4.0 due to SOLR - needs something more clever!
      33250: ALF-12366: Derek code review
   33254: Merge V3.4-BUG-FIX to V4.0 BUG-FIX
     33249 - ALF-12342 Excel 2003 Patterns.
   33256: ALF-12386 Change the simpler projects to use explicit dependencies, rather than blindly importing all of 3rd-party, to make generating downstream Maven POMs easier
   33266: ALF-12163 - mail.parameters.from does not use the from address provided
   33283: ALF-12185 SPP/Vti Mac Office checkin correction for Collaborators (Patch from Pavel Yurkevich)
   33295: Fix to SMTP authentication implementation.
   33296: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component)
             - New and improved mechanism for dealing with cache invalidation in Share load balancing and clustering based on the Hazelcast messaging system
             - See http://www.hazelcast.com/docs.jsp - and specifically http://www.hazelcast.com/docs/1.9.4/manual/single_html/#SpringIntegration
             - Sample per node cluster config provided in custom-slingshot-application-context.xml.sample
             - Tested with an Alfresco cluster plus a Share cluster both balanced via Apache server instances
             - Significantly improved Share stability with latest SpringSurf libs and individual node performance back up to non-clustered node speed
   Modified Alfresco JLan build to use newer hazelcast JAR and also modified existing build file references to use new jar location.
   33297: Merge V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) (RECORD ONLY)
      33292: ALF-12457: Merge V3.4.4 (3.4.4.8) to V3.4-BUG-FIX (3.4.8)
         33287: ALF-12400: Merged DEV/BELARUS/V3.4-BUG-FIX-2012_01_10 to V3.4.4 (3.4.4.8)
            33284: ALF-12400 CLONE - Security risk in Web View dashlet
            The check for user role was added to Web View and Site Links dashlets to disallow to configure Web View for Consumer, Contributor, and Collaborator roles and disallow to add Site Links for Consumer role.
      33286: ALF-9514 I18N: Model constraint values need localized display names
         - Applied diff file attached to JIRA issue (with a minor compiler error correction).
           It appeared to be a merge of: DEV/SWIFT r27643, r27645, r27692, r27846 and HEAD r28405, r29364
   33298: ALF-12461 If the OOXML file contains a thumbnail image, use this for the document thumbnail, plus improve the iWorks analoguous transformer
   33305: Fix for ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
   33306: Experiment - adding an sdk-extras target for the enterprise specific bits of the SDK.
   33308: Merged V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33242: ALF-5830 show_audit.ftl template doesn't work anymore
         - ISO9075 encode the node path
      33271: ALF-9659 In auditing, nodeNameValue extractor never works on a deletion event.
         - As pre call audit is not discarded on transaction rollback, we need to be able to have access to pre call values in the post call audit application.
           One such value is the nodeName for the post call of NodeService.deleteNode()
      33274: Merged DEV to V3.4-BUG-FIX
         33273: ALF-12314: Failed to create content due to error: lockOwner is a mandatory parameter
            It is necessary to pass the correct 'lockOwner' of a rendition, for example, to use 'rr.getLockOwner()' instead of 'lockOwner'
      33277: ALF-12436: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         33275: ALF-12426: Correction to joins in select_ContentDataByNodeIds
            - inner join to alf_node_properties first
      33279: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         33278: ALF-12393: Another indexing race condition when MySQL read committed is enabled, this time in the debug diagnostics!
      33282: Merged V3.4 to V3.4-BUG-FIX
         32979: ALF-12114: Reverse merged ALF-10282 and related changes from V3.4-BUG-FIX, which have caused serious regressions
            31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation
            32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements   
         32998: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.4
            32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded
               - Fixes regression introduced by r31972 / ALF-11489
         33084: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to V3.4 (3.4.7)
            33069: ALF-12266 NPE creating content using the web form
            Locale language can be passed not only as lang_country but as only country code as well.
         33257: ALF-10340: patch.db-V2.2-CleanNodeStatuses must now have patch.db-V2.2-Upgrade-From-2.2SP1 as an alternative to allow upgrade from 2.2.8
         - That's because patch.db-V2.2-Upgrade-From-2.2SP1 exists in 2.2.8 and once run it's too late to run patch.db-V2.2-CleanNodeStatuses
         33260: Set failonany=true on distribute-installers parallel task so that the build actually fails if an installer fails to build
      33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
         33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
            - The diagnostic code I added to track memory leaks was actually causing some!
            - For some reason I was recording a new reference when the index reader was dereferenced rather than clearing it
            - Would affect scenarios where the main index is long-lived and there are no writes to it and lots of searches
            - Spotted by Pavel
            - Too much late night coding!
      33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
         33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired()
   33315: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console
   33321: Remove /hazelcast lib dir include which is no longer required as libs are now at lib root folder
   33322: ALF-2550 - Enterprise SDK files do not contain enterprise repository project.
   33323: SDK - Added Enterprise third party libs.
   33327: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33324: Fix for THOR-941. Some MIME types appear as Unknown in metadata form.
   The inconsistencies in the edit mimetype form were slightly different on V4.0.1 so I tidied them up.
   33330: ALF-12487 In Mimetype Detection, if Tika detects a generic type of text/plain or XML, defer to the Alfresco filename based type (as we already do for octet stream)
   33335: Quick build fix - comment out SDK enterprise docs while I work out what's wrong.
   33353: Added more projects to Enterprise Generate Docs.
   33357: When installing a module the tool reads the war's version.properties file and will not install if the war version is outside the repoVersionMin or repoVersionMax
   33361: Merged DEV/GETHIN/FINDBUGS to V4.0-BUG-FIX
      32962: Findbugs fix: Suspicious comparison of Integer references
      32963: Findbugs fix: Call to equals() compares different types
      32968: hashcode should be hashCode
      32970: Findbugs fix: Suspicious comparison of Integer references
      32972: Findbugs fix: Suspicious comparison of Integer or Long references
      32976: Findbugs fix: .remove() incompatible with expected argument type String 
      32977: Findbugs fix:  String is incompatible with expected argument type 
      32978: Findbugs fix: Call to equals() compares different types
      I prefer this fix to the previous one I did
      32982: Findbugs fix: Call to equals() compares different types
      classDefinition.getName().equals instead of classDefinition.equals 
      32983: Findbugs fix:  String is incompatible with expected argument type java.util.Locale
      32984: Findbugs fix: An apparent infinite loop
      32985: Findbugs fix: bad month value of 12 passed to new java.util.GregorianCalendar
      This code passes a constant month value outside the expected range of 0..11 to a method.
      32986: Findbugs fix: authenticationComponent masks field from superclass
      32987: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      32988: Findbugs fix: Incorrect lazy initialization of static field
      Now uses static initialization block
      32989: Findbugs fix: Dead code: A null pointer would have been thrown before these lines
      32990: Findbugs fix: possible null pointer dereference
      Just made the code a little clearer
      32991: Findbugs fix: class defines a clone() method but the class doesn't implement Cloneable.
      32992: Findbugs fix: All equals() methods should return false if passed a null value.
      32993: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      32994: Findbugs fix: If the multiplication is done using long arithmetic, you can avoid the possibility that the result will overflow.
      33006: Findbugs fix: possible null
      Just made the code a little clearer
      33007: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      33008: Findbugs fix:  Call to String.equals(Character)
      Explicitly using String
      33009: Findbugs fix:  int converted to long and passed as absolute time to new java.util.Date(long)
      Now works after the year 2037!
      33014: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      33023: Findbugs fix: There is an apparent infinite recursive loop
      No longer
      33025: Findbugs fix: possible null
      Just made the code a little clearer
      33026: Findbugs fix: impossible null check
      Changed && to ||
      33029: Findbugs fix: Minor change to Integer.valueOf
      33126: Findbugs fix: Comparison of String objects using ==
      now used .equals
      33127: Findbugs fix: Unwritten field.  All reads of it will return the default value. 
      Now sets values in the constructor
      33128: Findbugs fix: Removed try/catch
      33129: Findbugs fix: Added an assertTrue to the unit test
      33130: Findbugs fix: Passes null for nonnull parameter
      Mocked the serviceReg and now the tests work!
      33131: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter   
      33133: Findbugs fix: Deadly embrace between inner class and thread local - not eligible for garbage collection.
      Made inner class static
      33182: Findbugs fix: possible null
      Now intialises documentPaths correctly
      33184: Findbugs fix: possible null pointer (no more)
      33185: Findbugs fix: Comparison of itself
      Changed variable name to fixedValue
      33186: Findbugs fix: Possible null pointer dereference of nodePair
      Now continues
      33187: Findbugs fix: This code seems to be using non-short-circuit logic
      33188: Findbugs fix: Possible null pointer dereference of entry
      Discussed with Andy. If there's no entry then throw the exception, we can't continue
      33189: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter
      It must want to remove the user
      33199: Modified the end of line character
      33209: Changed tabs for spaces
      33210: I removed the "if" because it was never called, however Brian suggested moving it to a place where it would be called!
   33363: Fix for ALF-12374 - Share sample 'share-config-custom.xml' is missing an endpoint 'activiti-admin'
   33364: Merge V3.4-BUG-FIX to V4.0-BUG-FIX
     33362 : ALF-12448 - Missing jars in enterprise SDK
   33376: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33375: ALF-12154: Merged HEAD to V3.4-BUG-FIX (3.4.8)
         Requested to RECORD ONLY this change when merging back to HEAD/V4.0-BUG-FIX etc.
         - Removed duplicate 'List constraint display labels' values from bpm-messages*.properties and dictionarydaotest_model.properties.
           May have been introduced by ALF-9514 changes in the same area, which was also RECORD ONLY
         - Manual merge of JSON propertyLabels that exist in HEAD back into 3.4.8
         32724: OPEN : ALF-11176: Untranslated strings in Group Review and Approve Task form
         Activiti has one default transition "Next".  If there is no transition then the model builder was not finding a translation for the task outcome (and just using the english word, e.g. "Approve").  Now it looks up the translation workflowtask.outcome.[wf:outcome property]
         32943: FIXED : ALF-11176: Untranslated stings in Group Review and Approve Task form
         I've changed the way task descriptions are retrieved. You can now enter translations for them.
   33377: ALF-12509: ibooks Format
   Added quick.ibooks file
   33378: ALF-12207	IMAP: Empty file is not opened/downloaded (using IMAP Content Links) if it was uploaded to Share via fileserver
   33379: Add the TIFF mimetype
   33380: Improve the stream to Tika conversion code, following review for THOR-952
   33385: Upgrade to the latest Tika and POI, for recent bug fixes
   33387: ALF-12492 - Email with empty subject sent to Alfresco by SMTP cause Null pointer Exception
   33396: ALF-12497 - Opening and closing (not save) MS Exel 2003 file via CIFS adds new version
   33397: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33259: ALF-12354: DB2 reference files.
      33261: ALF-12354: MySQL reference files.
      33268: ALF-12354: Oracle reference files
      33310: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2
      33349: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2
      33366: ALF-12412: Schema reference files should contain schema version number
      33367: ALF-12412: Schema reference files should contain schema version number
      33373: ALF-12354: Added comment to DB2 file regarding intermittent comparison failures.
      33389: ALF-12516: Produce XML schema definition file (XSD) for schemacomp reference files.
      33390: ALF-12516: added missing file (the actual XSD!)
      33392: ALF-7260 RINF 03: Automate DB schema validation
   33401: FindFindbugs fix: Maybe Derek expected null after all
   33406: Latest SpringSurf libs - fixed use of java.util.UUID which blocks
   33407: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX
       33399: Fix for ALF-11962 Lucene queries searching on metadata (not on cm:content) with stopwords returns wrong results
   33414: ALF-11746 Webscript to expose the repository mimetypes, along with their user facing display names and their extensions
   33415: ALF-11746 Mimetype information can be available to all
   33442: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      33441: Latest SpringSurf libs - performance and thread safety improvements.
   33447: Fix to email test - query error exposed by recent change.
   33451: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33446: ALF-12354: fixed DB2 intermittent unique index creation problems.
      33448: ALF-7260: removed redundant code.
   33454: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33388: Removed L10N that no longer have a default. 
      33437: ALF-9514 I18N: Model constraint values need localized display names
          - Undo changes to webclient_ja.properties that were made by r33286 for this issue.
            There were no changes in webclient.properties that did not already exist in webclient_ja.properties
            This should simplify translations.
      33453: ALF-9514 I18N: Model constraint values need localized display names
         - Tidy up mess to do with the initial r33286 revision for this issue. Lots of L10N property changes.
           I think some of my trial merges from 4.0 did not get reverted before I applied the diff file.
           Reverse merged r33437 and r33286. Note r33388 and r33375 (for ALF-12154) already included changes to try and fix the initial revision.
   33456: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX:
      33455: ALF-12410: JMX Dumps taking very long to finish
   33457: SDK build fix
   33463: Add in Enterprise Docs to SDK (again)
   33464: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33312: ALF-12448: Merged HEAD to V3.4-BUG-FIX (3.4.8)
         33304: ALF-7542 SDK is missing spring-test.jar
            - ant script modified to copy org.springframework.test*.jar files into root\build\assemble\sdk\lib\server\dependencies   
      33382: ALF-10239 Form validation bug when content becomes invalid after XSD change
         - override isValidForSubmit function in alfresco.xforms.TextField as alfresco.xforms.Widget version does not check the max length
      33383: Fix for ALF-11791 - Multiple search on category in Share Advanced Search return no result
         Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX
            29710: SVC15: Contribution: Alfresco Share Adv Search Enhancement: Allow advanced search on category to include sub-categories in query by checking a checkbox as in Alfresco Explorer (ALF-7157)
                   A new "showSubCategoriesOption" has been added to the "category.ftl" form control, that when set to true (as shown in the example config snippet below) will display a checkbox allowing the user to request all sub categories be searched as well as the selected ones.
                     <field id="cm:categories">
                        <control>
                           <control-param name="compactMode">true</control-param>
                           <control-param name="showSubCategoriesOption">true</control-param>
                        </control>
                     </field>
            30572: Fix for ALF-7008 - Double category in Share Advanced Search return no result
      33384: Fix for ALF-12469 - Change method BaseAssociationEditor.generateFormSubmit to protected
      33400: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         33354: ALF-12393: Parent assocs must be cached with a txn ID, even when a node has no parents
            - Use left outer join in parent assocs query
         33355: ALF-12393: Fixed typo in SQL + allowed assocIndex to be null
      33413: ALF-12219: Fix CommandServlet to not mess up Document List and My Spaces List dashlets on Websphere
      33416: ALF-12411: Merged DEV to V3.4-BUG-FIX (with corrections)
         33404: Fix that introduces full Unicode character support into jBPM 3.3.1:
            - new patch that alters columns of the jBPM 3.3.1 tables to change 'TEXT' datatype to 'NVARCHAR(MAX)' (SQL Server and Generic dialects);
            - 'jbpm-upgrade.sql' patch modified to alter as in the new patch;
            - 'AlfrescoSQLServerDialect' fixed to allow create tables with 'CLOB' columns as 'NVARCHAR(MAX)' columns
            - devious chain of alternatives (suggested by Derek) introduced to make sure the right patch executes under the right circumstances
      33418: ALF-9507: Fixed possible LDAP security hole
         Now we force RFC 2254 escaping of the user DN resolution query using argument substitution, as described here   
      http://docs.oracle.com/javase/jndi/tutorial/ldap/search/search.html
      33419: ALF-9658: Corrected AFTER_INACTIVITY cache update behaviour in InMemoryTicketComponentImpl
      - Now the key is preserved on entry update and not accidentally regenerated
      33421: Merged DEV to V3.4-BUG-FIX
         32042: ALF-11448: ArrayIndexOutOfBoundsException caused by unsynchronized call in org.alfresco.repo.webdav.WebDAV.formatModifiedDate
            Creation of SimpleDateFormatter was moved to a method.
      33422: ALF-12302: /api/tags API returns badly-formed JSON
      - Resolved as suggested by MH
      33423: ALF-10312: Parameter Based Redirection
      - Now we validate that the Explorer login page redirect URL is within the context path of the application (/alfresco)
      33424: Merged DEV to V3.4-BUG-FIX
         33358: ALF-11719: Webscript fails due to colon in password
            Split basic authentication header by first colon. Remaining part is user's password.
      33425: Merged DEV to V3.4-BUG-FIX
         33359: ALF-12071: Windows 7 cannot open files stored on Alfresco mounted as a webdav network drive if the filename contains + (plus) character
            For Windows 7 we SHOULD decode the file name gotten from GET request taking into account that "+" is not encoded as "%2B" for GET request.
      33426: Merged DEV to V3.4-BUG-FIX (with corrections)
         33374: ALF-10713: Remaining dependencies repo.remote.url from outboundSMTP-context.xml and activities-feed-context.xml was removed and SysAdminParams bean was injected instead. 
            - MailActionExecuter.URLHelper returns url to alfresco using SysAdminParams.
      33427: ALF-10713: repo.remote.url no longer used in 3.4.8 so removed altogether
      33429: Merged HEAD to BRANCHES\DEV\V3.4-BUG-FIX
          31191: First fix for ALF-10741 TAG field does not support wildcard, prefix, fuzzy queries etc -> wildcard searches entered by users will fail (for ALF-12162)
      33433: ALF-12411: Fixed postUpdateScriptPatches declaration
      33435: ALF-11719: Fix Authorization and AuthorizationTest
      33436: ALF-12411: Fixed patch script paths
      33445: Fixes: ALF-12389; internationalises the tool tip strings for changing the data list sort order.
      33449: ALF-12411: Fixes from Dmitry
      - Corrected ID of patch.db-V3.4-Upgrade-JBPM
      - dependsOn property has no effect on a SchemaUpgradeScriptPatch - order controlled by schemaBootstrap.postUpdateScriptPatches   
      33459: ALF-9811: SSOAuthenticationFilter now supports basic auth as well.
   33471: ALF-12297	Emailing to document via inbound SMTP causes integrity violation
   33473: Reference schema files moved on from 5025 to 5026
   33478: Fix for ALF-12515
   33479: Fix for ALF-11116
   33481: Fix for ALF-12099
   33487: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33485: ALF-12598: Incorrect column order on indexes and primary keys must be reported to user
   33496: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33494: ALF-12412: Schema reference files should contain schema version number
   33508: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33507: ALF-12412: Added missing files
   33515: Merge (Record Only) V3.4-BUG-FIX to V4.0-BUG-FIX
     33495 : SDK Build fix - do not merge to V4.0
   33517: V4.0 version of the fix for ALF-12393
    - The node caching structure in 4.0 is version-based and there was already a check to
      ensure that in-memory vs database versions matched for all calls to get parent associations.
    - Added an additional version check for cases where the node returns no parent associations
    - Removed right outer joins associated with the 3.4 fixes (minor complexity that is no longer required)
   33555: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33554: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         33512: GERMAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33513: SPANISH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33514: FRENCH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33516: ITALIAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33526: JAPANESE: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33544: SPANISH: Fixes additional Spanish translation bugs
         33552: JAPANESE: Adds previously missing workflow related translations
   33560: Fix the line endings to be consistent
   33561: DOC-335 Provide a commented out example of SPP/Vti SSL Configuration in the Module
   33563: Merge (Record Only) V3.4-Bug-FIX to V4.0-BUG-FIX
     33328 : ALF-12098 Issue ALF-4010 not fully resolved. ftp transfer of a previously moved file copies it to the destination folder of the previous move
   33566: fixed a comment.
   33567: Small change to debug logging
   33568: Removed deleteConfirm flag.   Not neccessary as events are fired postCommit.
   33570: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33550: Fixed ALF-10895 "Links, documents and folders: Unable to delete comments"
         - Made sure no "content" is sent when using HTTP DELETE to avoid proxy issues
   33574: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33573: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         33557: JAPANESE: Removes redundant string
   33576: ALF-12634 When building the edit online link to SPP/Vti, don't assume that the protocol (http/https) is the same as Share, but instead make that a module property (similar to how the port and hostname are set)
   33577: Remove un-used imports
   33584: ALF-12363: Protect against attempt to reference undefined rawPerms variable in folder-permissions WebScript controller
   33586: ALF-12405: Always show delete site icon on My Sites dashlet when viewed on IE7
   33605: Fixes: ALF-12408: Script Error when hovering on a row.
   33616: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX
       33500: Fix for ALF-12162 Searching for words with german umlaut does not show expected results
   33624: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled.
   33637: ALF-11594: Disable comment field on upload dialog after version update
   33643: ALF-12243: Fixed create HTML content via HTML editor
   33649: Minor: tabs
   33650: ALF-12657: We need to set maxSavePostSize for tomcat connectors to support SSL (e.g. ModelsGet from SOLR will truncate JSON to 4096 characters)
   33662: Fix for ALF-12460
   33663: Fix for ALF-12460 (part 2)
   33664: Fix for ALF-12460 (part 2)
   33665: Fix for ALF-12443
   33672: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33468: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX
         33467: Enterprise overlay update for MessagesWebScript
      33470: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX
         33469: Revert rev 33467 - not required
      33482: Fixed ALF-12373 "IE7 Specific: incorrect displaying of "Link to Rule Set" window in Alfresco Share"
      - also fixed for ie6 removed javascript error thrown on click
      33580: Minor formatting for easier debug stepping
      33581: Fixed ALF-12638: No username in an audit context after an error
      33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9)
         33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times
            - correction to js contains function. Bug introduced in r32775
      33597: Merge DEV to V3.4-BUG-FIX
        33465 : ALF-11193 - Consumer role cannot Unscribe/subscribe the IMAP folders.
      33602: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/DEV/V3.4-BUG-FIX:
         32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself
      33630: Merge Dev to V3.4-BUG-FIX
         33626 : ALF-4896 - Lock icon displayed for documents with expired lock
      33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9)
         33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed
            Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission.
            It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store.
            This had already been done for the main user store a few years back.
            As the managers parameter was no longer needed the was removed.
      33647: Merged DEV to V3.4-BUG-FIX
         33629: ALF-12585: Manage System Users shows "Change Password" icon for LDAP users in search results
            Sets "isMutable" property using addPropertyResolver in UsersDialog.   
      33648: Merged DEV to V3.4-BUG-FIX
         33623: ALF-10586: CMIS: Trying to delete a multilingual document w/o translations via webscript
            There is no need to delete associations in CMISServicesImpl.deleteObject().    
      33659: Merged V3.4 to V3.4-BUG-FIX
         33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4:
            32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself
         33595: Reverse merge of the following. Should have been committed to V3.4-BUG-FIX
            33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4:
               32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself   
         33604: ALF-12597: WCMQS doesn't work out of the box
         33654: Merged DEV to V3.4
            33622: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page)   
               User userIsSiteManager is true by default in webview.get.js. This allows to configure Web View dashlet on user's dashbord.
            33651: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page)   
               Sets userIsSiteManager=false before remote call, so if remote call fails it won't give site manager role to the user.
         33655: ALF-12366: Merged PATCHES/V3.4.6 to V3.4
            33548: ALF-12393: More changes to cope with read committed DB behaviour in AbstractReindexComponent
               - Reverted r33278, 33354, 33355 and introduced more generic solution
               - NodeRefs resolving to deleted nodes in the cache cause cache cleaning and transaction retry if they resolve OK in the database
               - Cached parent assocs are thrown away for non-deleted nodes if they are empty
               - Removes the need for the outer join and special case exception handling all over the place   
            33562: ALF-12393: Further improvments
               - Lookup of NodeRef to a deleted node must always result in cache clearing and transaction retrying (due to possible read committed behaviour half way through transaction)
               - Detection and correction of stale cached negative results (VALUE_NOT_FOUND) in node cache   
            33583: ALF-12393: Rework to getNodePair(NodeRef) to have less impact on existing code but still cope with read committed
               - Look ups of deleted nodes still cause InvalidNodeRefExceptions but these have a retryable cause so that both handlers can handle and retrying transactions can recover
               - Corrections to cached negative results (because the nodesCache remembers negative results) are written straight through and the transaction does not need to be retried
      33660: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         33634: ALF-12161: Merge V3.4-BUG-FIX (3.4.9) to V3.4 (3.4.8)
            33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9)
               33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed
                  Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission.
                  It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store.
                  This had already been done for the main user store a few years back.
                  As the managers parameter was no longer needed the was removed.   
         33657: ALF-12650: Merged PATCHES/V3.4.6 to V3.4
            33590: ALF-12620: Merged V3.4-BUG-FIX (3.4.9) to V3.4.6 (3.4.6.10)
               33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9)
                  33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times
                     - correction to js contains function. Bug introduced in r32775
   33673: Fixed compilation error
   33678: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33677: Merged V3.4 to V3.4-BUG-FIX
         33676: ALF-12436: Increase content data cache sizes to match node properties cache sizes to allow bulk loading without overflowing
   33679: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      33486: Merge V4.0-BUG-FIX to V3.4-BUG-FIX
        33306 - experiment to add sdk-extras
      33489: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
        33322 : Enterprise SDK
        33323
        33335
        33353
        33457
        33463
      33495: SDK Build fix - do not merge to V4.0.
   33680: Merged DEV to V4.0-BUG-FIX
      33675: ALF-12379: WebLogic: alfresco fails to start: java.lang.NoSuchMethodError: org.apache.commons.lang.mutable.MutableInt.increment()V
         org.apache.commons.* package should be used as application's preferrable for WebLogic.
   33683: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33682: Merged V3.4 to V3.4-BUG-FIX
         33681: ALF-12132: Fix Bitrock's copy of the custom lotus context. Yuck!
   33689: Fix for ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang
   - filter out changes to read only properties when set in bulk - ie they are ignored
   33691: Fix for ALF-12667
   33693: Fix for ALF-12695 SOLR should not appear to work with AVM - it should not silently fail.
   - AVM search and indexing will raise exceptions when used with SOLR
   - removed the AVM site bootstrap associated with Share in older versions of the product.
   33701: Merged DEV to V4.0-BUG-FIX
      33697: ALF-12691: Alfresco Explorer doesn't work: java.lang.NoClassDefFoundError: org/apache/commons/lang/builder/HashCodeBuilder
         Shared library for WAS was fixed. commons-lang-2.6.jar is used.
   33704: ALF-12299 - NFS subsystem enable/disable needs a different attribute name
   33714: ALF-10229: DOS Voodoo to set ALF_HOME to the parent parent directory of the apply_amps script
   - for /D %%D IN (%~dp0..\) do set ALF_HOME=%%~dpD
   - Yuck!
   33721: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33720: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/DEV/mward/schemacomp:
           33631: LF-12355 : Create schema reference files for SQL Server
   33727: Test fix - fallout from removing the bootstrap for the "sitestore" AVM store
   33729: Fixes: ALF-12575 - missing i18n strings. (translations pending)
   33738: SPANISH: Translation updates based on EN r33523
   33739: Merged DEV to V4.0-BUG-FIX
      33723: ALF-10229: apply_amps.bat doesn't work properly from alfresco-enterprise-4.0.0a.zip
         Fix for apply_amps.sh to set ALF_HOME to the parent parent directory of the apply_amps script
   33746: ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock 
   - Part 1: 
     - SOLR query use during bootstrap will throw an exception
     - tidy up some patch beans
     - ignore unused AVM "sitestore" in WCMPostPermissionSnapshotPatch
   33753: Remove upgrade installers from build targets


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-02-08 11:06:09 +00:00