19 Commits

Author SHA1 Message Date
Neil McErlean
cd38dfbfeb Fix for ALF-20023 Recent Sites and Favourite Sites in copy/move pickers empty
So the bug was caused by 2 problems: one in ScriptPreferenceService and one in person.sites.get.js
The first problem was that ScriptPreferenceService constructs raw Mozilla NativeObjects - a very unusual practice in itself - and it does not provide a default value as required by ECMA 9.1 from the ECMA standard. I've added this code to the NativeObject (can't change the type to ScriptableHashMap<K, V> or similar as the API is published).
I've also fixed the same bug (unreported, possibly never apparent) in a jbpm class.
The second problem was that person.sites.get.js simply could never return preferences data if the caller provided a filter (favourites or recents) and did not also provide a page size.
There was a logic error in the algorithm such that the size defaulted to 0 thus providing a 'page' of zero results as a default.
I assume this is a merge error from cloud, but I don't know.
I added tests for the JavaScript API's favourites/recents filter calls and logging here and there.
Also deleted some dead code.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-18 15:27:51 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00
Kevin Roast
65f1931ee8 Merged BRANCHES/DEV/HEAD-QA to HEAD:
48730: Record only merge from 4-1.BUG-FIX (4.1.5) to HEAD-BUG-FIX (4.2)
      48447: Performance problem with Eclipse can be fixed by excluding the web-client build directory from the searchable resources.
         Done for 58 other projects (generally include in the 4.1 code line)
      48726: Reverse Merge (did not work after an Eclipse Clean) - already done on HEAD
         48447: Performance problem with Eclipse can be fixed by excluding the web-client build directory from the searchable resources.
         Done for 58 other projects (generally include in the 4.1 code line)
   48929: Synced up with HEAD r48903
   48957: Merged PATCHES/V4.1.4 to HEAD-BUG-FIX
      47847: Merged V4.1-BUG-FIX to PATCHES/V4.1.4
         47625: Fixed  ALF-18063
         - AlfrescoUtil's getPages method now parses json using jsonUtils.toObject to force strict json
         - CSRFFilter got new throwError action meaning the filter now can stop certain resources form being reached directly from the browser
         - /remoteadm/* webscripts can no longer be accessed directly from the browser
         - Modified regexps to be easier to read
         - Added config samples
      47879: Merged V4.1-BUG-FIX to PATCHES/V4.1.4
         47878: Final part of fix for ALF-14086 - Sort order of folders including hyphens ( - ) are different in folder-tree and view on folders (in Share)
          - People Finder
      47912: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.4:
         47909: ALF-18257: partial fix - adds back in missing TinyMCE files.
      47928: Merged V4.1-BUG-FIX to PATCHES/V4.1.4
         47913: Final part of fix for ALF-18257 - AWE panel is not displayed
      47932: ALF-14587: Created article or publication cant be viewed on WQS site
      - Fix by Dmitry Vaserin
      - Same fix was done to style1.get.html.ftl in ALF-17117
      47956: ALF-10243: workflow shows wrong date
      - Missing WQS date field configuration
      47983: ALF-15803: CH, NL, RU: There are no Chinese, Russian, Dutch templates for IMAP messages and Chinese, Russian templates for Email messages
      - Email templates from Gloria
      48026: ALF-15803: CH, NL, RU: There are no Chinese, Russian, Dutch templates for IMAP messages and Chinese, Russian templates for Email messages
      - Email templates from Gloria
      48027: Merged V4.1-BUG-FIX to PATCHES/V4.1.4
         48020: Fix for ALF-18220 - Cancel checkout in 'View Original Document' view fails and causes document stuck in checkedout state.
      48048: Merged BRANCHES/DEV/DWEBSTER/HEAD_AWE to PATCHES/V4.1.4:
         48047: Fixes: ALF-14758. Adds z-index as a work around to an overlapping menu bug that occurs if they are created in a particular order and viewed on a large enough resolution monitor.
      48086: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.4:
         48083: Fixes ALF-14931
      48121: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.4:
         48116: Fixes build failure caused by 'fix' for ALF-14931
      48153: Merged V4.1-BUG-FIX to PATCHES/V4.1.4
         48102: Fix for ALF-18354 - SPP-Meeting workspace event can be edited and deleted on Agenda tab
         48124: Fixes ALF-18349: Slideshare and YouTube channels can now be created.
         48151: Fix for ALF-15475 - Liferay Portal: IE9: Layout of portlets is broken when document details page is opened
      48156: Improved fix (removed useless media queries) for ALF-18196 - Document Preview - Flash Movie Sized to a Thin Horizontal Bar at 1024x768 Resolution
      48185: Another go at a solution for ALF-16413 - Share asks for Basic-Auth while not needed trying to access RSS feeds (thus breaking SSO).
      48189: ALF-17818 - Strikethrough formatting is not preserved in Wiki
      48208: ALF-18385: Alfresco Explorer: Localization is not applied after login.
      - Fixes regression caused by ALF-17189
      48261: Fix for ALF-18352 - Manager can not update permissions more than once for the folder/content created by other user
      48264: Merged DEV to PATCHES/V4.1.4
         48258: ALF-18325 : Can't delete wcmqs if it was published to live
         We should also check for site is not being deleted before creating site container.
      48283: Correction to fix for ALF-18196
      48284: Fix for ALF-18328 - Share dependencies containing dependencies breaks Hazelcast clustering
      48352: Fix for MNT-6390 - Incorrect type for Group and Review workflow after task approved by all users
      48354: Fix for MNT-3196 - No information is displayed in My Activities and Site Activities dashlets for content creation
      48390: MNT-6292: Created article or publication cant be viewed on WQS site
      - Fix researched by Dmity Vaserin
      - More handling of empty lists
      - It seems that WCMQS requires renditions to be indexed (in order for them to be returned by CMIS queries) so we must remove the ASPECT_INDEX_CONTROL aspect from them in RenditionHelper
      48424: Fixed MNT-7521 "Document Library" instead "File Plan" displayed in the site navigation bar
      48430: MNT-7522: Users with "read only" or "read and file" permissions don't have access to RM folders
      - In ScriptNode.childByNamePath() check for PermissionService.READ permission rather than PermissionService.READ_PROPERTIES permission, which apparently isn't compatible with RM!
      48434: MNT-7522: Users with "read only" or "read and file" permissions don't have access to RM folders
      - Corrected fix with help from Andy Hind
      48500: Fixed MNT-6311 "Activities with Google Docs are not displayed in My Site Activities and Site Activities dashlets"
      48548: MNT-7528 My Tasks to Do and My Pooled Tasks dashlets do not show the correct description of a workflow 
      48635: MNT-8482 Enterprise 4.1.4: Backwards compatibility breaking change in public Java API class org.alfresco.service.cmr.dictionary.ClassDefinition
         - Added back in missing methods and using StaticMessageLookup so will still have the issue identified by MNT-413.
           The new methods still exist and don't have this issue.
      48645: MNT-8484: Oracle: An unexpected difference is present after comparison of database schema with reference schema (post-upgrade) 
      48729: MNT-8498 Could not transform .psd file 
      48745: MNT-8527: Activity Feed Cleaner broken on Oracle
      - Due to ibatis weirdnesses, the select_activity_user_feeds_greater_than_max query has to exclude results with null user_ids (non user feeds) as this maps to a null row on Oracle and results in an NPE!
      - Also fixed all comparisons with feed_user_id to be NULL safe
      48751: Fixed MNT-8504 "Script error occurs when clicking Edit Tags action from document/folder details page"
      - Removed js_string encoding of nodeRef and made sure nodeRef is taken from the repo instead of the page url
      48752: MNT-8467: Cannot authorize to Share Kerberos automatically
      - Reversed r44754 performance fix causing this (Sorry Kev)
      48755: MNT-8514: Incorrect workflow status is displayed on My Tasks dashlet
      - Fix by Viachaslau reviewed by Frederik
      48756: MNT-8531: Merged PATCHES/V4.1.3 to PATCHES/V4.1.4
         48683: MNT-8494: Lucene index recovery fails to reindex an orphaned node whose parent is deleted
         - Added unit test for this and fixed regression over MNT-6545 fix
         48717: MNT-8494: Lucene index recovery fails to reindex an orphaned node whose parent is deleted
         - Strengthened unit test to check for deleted nodes with parents and strengthened handling of these as a result
         - Hopefully fixes unit test failures
      48798: Fixed MNT-7646 "CLONE - [Pentest] Internet Explorer <= v8 XSS"
      - Share now inspects text/xml content from the webscript content, if it finds a <!DOCTYPE svg> it will change the mimetype to text/plain.
      48810: Upgrade Surf version in POM files to 1.2.0-M4 (r1217)
      48819: Fixed MNT-8504 "Script error occurs when clicking Edit Tags action from document/folder details page" part 2
      - Fix on folders page
      48820: Make SchemaReferenceFileTest actually output its reason for failing - I can't track down the temp files!
      48822: MNT-8508: Fixing description-property in LazyActivitiWorkflowTask which is not the same as WorklfowTask.description
      48823: BDE-130: fail the build when yuicompressor minimization fails
      48890: Fixed MNT-8554 "FF: Download button on Document Details page is not working"
      - Note also fixes the "Comment" widget in the header not working (in any browser)
      48933: MNT-8560: It's impossible to find the user by any property except the username
      Modify People.getSortedPeopleObjects() method to create ArrayList based on provided List<NodeRef> and use it for sort, because provided List<NodeRef> can be unmodifiable list.
   48964: MNT-6494: Fixed merge issue (already fixed in HEAD-BUG-FIX)
   49033: Merged PATCHES/V4.1.4 to HEAD-BUG-FIX-QA
      48996: MNT-8564 : CLONE - Incorrect saving process when editing event
      Fix event.put.json.ftl to produce valid json
      49006: MNT-8555: Reverse Merge MNT-6419 (ALF-17089)
         45245: ALF-17089 (Displaying Url Name instead of site Name in Select form)
         47089: ALF-17089 (Displaying Url Name instead of site Name in Select form)
   49039: Merged HEAD to HEAD-BUG-FIX-QA
      48931: Fixed CLOUD-1511 "My Documents dashlet is crashing when inspecting the syncmode value"
      48955: Fix name of wdr-deployment jar in mvninstall task
      48979: ALF-18573: fix sharepoint module context name.
      This is a change that was appropriate for cloud but had crept in to HEAD during the megamerge.
      48988: Fix integration with CLOUD2 + compile and package remote-api test classes separately
      48995: CLOUD-1460 "CloudConv: Re-implement header customizations"
      - #1. Re-add link so network admin can access admin console 
         Added in widget ids that could be referenced to add and remove widgets in the user & app items menu
      49008: Fix public api tests
      49014: Fix public api tests
   49136: Fix public api tests
   49141: Merged HEAD-BUG-FIX to HEAD-QA (thus completing 4.1.4 -> HEAD-QA merge)
      49139: Merged PATCHES/V4.1.4 to BRANCHES/DEV/HEAD-BUG-FIX (mergeinfo committed earlier)
         48735: Fixed MNT-8506 & MNT-8507
            * MNT-8506 "A server error has occurred when press Follow/Unfollow button from User Profile"
            * MNT-8507 "A server error occurs when set "Private" checkbox on My Profile"
            * Instead of using Alfresco.util.Ajax.request and creating XHR requests forms were being submitted 
              meaning the Alfresco-CSRFToken never got added.
            * Now refactored to use Alfresco.util.Ajax.request and post directly to the proxy, 
              meaning the Share "services" now can be removed.
         48812: MNT-8506 / MNT-8507: Fix up by Vasily to avoid YUI compression error
         48813: Fixed MNT-8507 "A server error occurs when set "Private" checkbox on My Profile" part 2
            - variable used keyword "private", now refactored to "isPrivate"
   49154: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA:
      48470: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI3 to BRANCHES/DEV/CLOUD1:
           48041: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAP2 to BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI3:
                47129: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI1 to BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAP2:
                     45439: PUBLICAPI-39: "Favourites API" wip
                     45681: PUBLICAPI-39: "Favourites API" wip
                     45897: Test a fix for issue found during bm testing - CMIS: null entries in property list values
                     45965: Public api performance investigation: test node bulk loading change
                     45978: PUBLICAPI-39/40: wip, changes from review.
                     46019: PUBLICAPI-39: "Favourites API" wip
                     46056: Re-instate opencmis config that was mistakenly changed
                     46156: Public api performance investigation: test node bulk loading change
                     46193: PUBLICAPI-39: "Favourites API" wip
                     46200: PUBLICAPI-39: "Favourites API" wip
                     46247: Upgrade to OpenCMIS 0.8
                     46248: PUBLICAPI-72: "Add users role to Site entity"
                     46249: PUBLICAPI-72: "Add users role to Site entity"
                     46250: PUBLICAPI-40: "Site membership API" - modifiedAt timestamp + some tidy up
                     46251: PUBLICAPI-40: "Site membership API" - bug fixes
                     46253: public api tests refactoring (split tests into separate classes by functional area), site membership api tests
                     46273: public api tests refactoring (split tests into separate classes by functional area), site membership api tests
                     46298: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled)
                     46299: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled)
                     46300: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled)
                     46311: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled)
                     46337: PUBLICAPI-79: "GET a Favorite"
                     46338: PUBLICAPI-79: "GET a Favorite"
                     46339: public api tests: some refactoring
                     46340: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled)
                     46345: Added name parameter to the @uniqueId annotation. e.g. @UniqueId(name="targetGuid")
                     46346: PUBLICAPI-39: "Favourites API" - tests
                     46359: PUBLICAPI-40: "Site membership API" - PUT requests and bug fixes
                     46380: PUBLICAPI-40: "Site membership API" - PUT requests and bug fixes
                     46381: PUBLICAPI-40: "Site membership API" - PUT requests and bug fixes
                     46397: PUBLICAPI-40: "Site membership API" - add missing file
                     46411: public api tests: re-instate tests (accidentally commented out)
                     46427: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled)
                     46442: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled)
                     46467: PUBLICAPI-80: "GET on a deleted Favorite answers a 500"
                     46476: Upgrade to OpenCMIS 0.8
                     46514: Initial implementation of WHERE clause functionality. (Likely to change a lot).
                     46518: PUBLICAPI-75: "Use a 'where' parameter to specify criteria for favorite result set content "
   49157: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA:
      48552: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
            48551: Fix for     DEVOPS-2976   P1 - Solr nodes crash with tracking enabled 
                   + configuration fixes
      48796: Merged BRANCHES/DEV/FEATURES/ACCOUNT_TYPES to BRANCHES/DEV/CLOUD1:
           48092: Resolve CLOUD-1303: Add 2 new Account Types to Cloud
           48325: Translations from Gloria
           48445: Japanese: translation update from Gloria
           48698: JA: Translation update from Gloria.
      49130: Merged BRANCHES/DEV/CLOUD1-HOTFIX to BRANCHES/DEV/CLOUD1:
           49120: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI3 to BRANCHES/DEV/CLOUD1-HOTFIX:
                49093: CLOUD-1518: "Favourite sites are not displayed correctly"
                49110: CLOUD-1518: "Favourite sites are not displayed correctly": fix up PreferencesService to return correct site preference keys
                49116: CLOUD-1518: "Favourite sites are not displayed correctly": favourite sites uses the favourites service rather thanpreferences service directly, making it and favourites consistent
   49159: fixup pesky solrcore.properties
   49197: Fix for Cloud AccountUsageQuotaTest - make action-executor node service mt aware (fallout from previous commit that now does a node existence check in action executor that needs to be mt aware)
   49199: Fix tests
   49241: CLOUD-1527 "Logo in Share footer is broken"
   - Added /res to make logo getting displayed when running in multi tenancy mode
   49250: CLOUD-1527 "Logo in Share footer is broken"
   - Removed image dimensions to make image replaceable
   49267: Fix tests: remove incorrect OpenCMIS jars
   49272: Use newer patched version of chemistry-opencmis-server-bindings
   49273: Removed extraneous chemistry library dependency
   49293: CLOUD-1512 "SAML integration needs to override "CSRFPolicy" config"
   - Adding new (overridable) getPath() method in CSRFFilter
   49315: Merged PATCHES/V4.1.4 to HEAD-QA
      49236: Fixed MNT-8615 "Browser page is not reloaded after deleting folder/file or after creation content in Repository"
      49301: Fixed MNT-8615 "Browser page is not reloaded after deleting folder/file or after creation content in Repository" part 2
   49316: Merged PATCHES/V4.1.4 to HEAD-QA (RECORD ONLY)
      48735: Fixed MNT-8506 & MNT-8507
         * MNT-8506 "A server error has occurred when press Follow/Unfollow button from User Profile"
         * MNT-8507 "A server error occurs when set "Private" checkbox on My Profile"
         * Instead of using Alfresco.util.Ajax.request and creating XHR requests forms were being submitted meaning the Alfresco-CSRFToken never got added.
         * Now refactored to use Alfresco.util.Ajax.request and post directly to the proxy, meaning the Share "services" now can be removed.
      48812: MNT-8506 / MNT-8507: Fix up by Vasily to avoid YUI compression error
      48813: Fixed MNT-8507 "A server error occurs when set "Private" checkbox on My Profile" part 2
      - variable used keyword "private", now refactored to "isPrivate"
   49328: Fix up People script class so that it deals with access denied exceptions (this will hopefully fix failing PeopleRestApiTest in Cloud2)
   49346: Fixed CLOUD-1532 "Test email signup page is brokebn due to new header"
   49364: Fixed CLOUD-1524 "Unable to retrieve Google Docs subsystem status from Alfresco (re: googleEditable not defined ?)"
   49373: CONV: Fix CLOUD-1524 / CLOUD-446 - disable GoogleDocsV1 subsystem and prevent deferred start (and associated error) when Share later calls explicit "status" webscript (to see that it is disabled)
   - revert 49364 and replace with alternative fix 
   - see also similar IMAP status issue (CLOUD-1507)
   49375: CONV: Fix CLOUD-1507 -fix IMAP subsystem to prevent deferred start (and associated error) when Share later calls explicit "status" webscript (to see that it is disabled)
   - see also similar GDocsV1 status issue (CLOUD-1524 / CLOUD-446)
   49416: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA:
      49303: CLOUD-1518: "Favourite sites are not displayed correctly": fix fallout
   49418: CONV: Fix ALF-18698 - Core MT: "create tenant" ignores the tenant-specific root contentstore dir path (if specified)
   49433: Fix for failing Cloud2 test https://bamboo.alfresco.com/bamboo/browse/THOR-CLOUD2HEADQA-JOB1-38/test/case/12496544
   49491: CLOUD-1552 "The invite link icon in the new header's site title "area" points to the "on premise" invite page (which has been admin secured) instead of the invite dialog"
   - Improving extensibility by adding further widgets ids for header menu
   49590: CLOUD-1556 "CloudConv: CLOUD2 does not start on DP: "Possible CSRF attack"" part 1
   - Not a bug in the CSRFFIlter but an improvement that introduces a <properties> elements which may hold variables used by the CSRFPolicy config 
      to avoid repetition and the possibility to only override the <properties> section in different environemnts, i.e. set different referer proxies in test & prod.
   49758: Fix for CLOUD-1542, Google Docs action was missing from the action list in the document library.
   An action is still listed in the document-browse action group that has no definition, this was causing the web tier webscript to abort processing of any actions defined after it i.e. any custom actions.
   49789: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
      49788: L10N update from Gloria, based on EN r48822
   49801: Move CLOUD2 to HEAD-QA, as part of Alfresco One project
   49806: Bring POM file back from CLOUD2
   49807: Fix order of from/set/to lines in rules, to match schema validation.
   49829: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
      49808: CLOUD-1615: CloudConv - Regression: CLONE: the info panel isn't wide enough to display the share link without a line break
           - Increased panel and image widths
   49830: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
      49823: CLOUD-1609: CloudConv - Regression: DAM: Item header was moved (also incorrect color is using) for folders and files.
           - Added overrides and changes to gallery view to accomodate changed CSS in detail and simple view
   49831: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
      49827: CLOUD-1610: CloudConv - Regression: DAM: More menu does not disappear after first opening more link
           - Fixed el passed in for onEventUnhighlightRow in fnHideDetailPanel
           - Also added hiding of more actions on mouseleave of more actions
   49834: SVN ignore patterns - "test" folder.
   49835: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA
      49800: Fix to build.properties that got munged in rev 49209. Fix to share-header that was horribly merged to pull in code with dependencies that aren't present yet. Fix to login dialog width that hasn't made it over to this branch for some reason.
   49872: Added name to logging of transformer registration
   49885: CLOUD-1626: CloudConv - Regression: Networks are not displayed via WebDav.
   Reinstated code that was originally part of THOR1_SPRINTS (r34168) but was lost as part of convergence work.
   49889: CLOUD-1669: upgrade jibx from 1.2.3 to 1.2.5 to allow full JDK7 support
   49906: Merged BRANCHES/DEV/BELARUS/HEAD-QA-2013_04_22 to BRANCHES/DEV/HEAD-QA:
      49794: ALF-18797 : SPP: Check out action doesn't work for Document Workspace
   Merged but with minor bug fix.
   49908: CLOUD-1649: Added the missing network menu for the public users.
   49916: Fix to User Factory bean setter to avoid:
   WARN  [springframework.beans.GenericTypeAwarePropertyDescriptor] [main] Invalid JavaBean property 'userFactory' being accessed! Ambiguous write methods found next to actually used
   49917: Merged SHOULDERS to HEAD-QA
      48984: Minor UI fixes:
                   - fix height of user status text-area to be consistent across browsers
                   - fix hover style and font size of user status text-area
                   - fix login dialog width since Cloud merge
   49918: Fix for CLOUD-1571 - CloudConv - Regression: My Sites dashet isn't loaded
   49919: Fix for CLOUD-1648 - CloudConv - regression: cloud2headqa is not localized in any language
    - code for the login language drop-down refactored to fit within login component rather than global function javascript
    - fixed to work since code convergence also
   49920: Fix for CLOUD-1584 - CloudConv - Regression: Some dashlets should be absent on User/Site Dashboard
    - Disabled new dashlets (Site Search, Saved Search, My Discussions) because they are too exciting for the Cloud.
   49921: CLOUD-1669 Switch -source and -target compilation parameters to 1.7
   49923: Fix to 404 error on login page (visible in firebug etc.)
   Correct list of image dependencies.
   49924: Fix for CLOUD-1629 - CloudConv - Regression: It's impossible to remove the Welcome Widget on Site Dashboard
    - encoding of preference values must handle "." dot character or it ends up as nested preference!
   49927: Fix for CLOUD-1577 - CloudConv - regression:Incorrect display of status message
   49928: Fix for CLOUD-1586 - CloudConv - regression:The user is redirected to login page after clicking 'Invite' button from Site members page
    - Button should be disabled on Cloud (redirect is because on-premise Invite page is admin only!) - but pattern to do so has changed since merge with 4.2.
   49931: WebDAV: exclusive lock could be obtained when shared lock already in place.
   In addition, the invalid lock state that was produced then led to a stack overflow due to infinite loop.
   49933: Added svn:ignore entires for build/pom.xml and root/privatemodules/thor/config/log4j.properties
   49936: CLOUD-1600: CloudConv - regression: Cannot add a tag through inline edit option
      - Removed mandatory validator
   49938: Merge V4.1-BUG-FIX to HEAD-QA
      48904: BDE-109: generate coverage statistics from JaCoCo when running tests
      48925: 3rd party classpath refers to available mysql-connector-java-5.1.13-bin.jar
      49065: Limit coverage to org.alfresco classes, otherwise overhead is too big and tests too slow 
      49474: MNT-8668 Remove Maven declared dependency on addressing-1.0.mar
      49655: BDE-109 new Ant task to generate JaCoCo report for test coverage
   49941: CLOUD-1668: CloudConv - Regression: Incorrect displaying of default avatar on task section on document's details page
      - Fixed avatar link
   49943: CLOUD-1661: CloudConv - Regression: progress bar is absent in Storage section on Account Summary page
      - Brought theme-bg-3, theme-bg-4, and theme-border-5 CSS over from greyTheme to lightTheme
   49958: SpringSurf libs upgrade to r1257
   Updated Cloud share config overrides to remove values that are now the default in Surf (e.g. reconnect-timeout etc.)
   49965: Fix for CLOUD-1588 - CloudConv - Regression: "Download as Zip" option should be absent
    - remove the lovely new Download as Zip feature from Cloud as it is Officially Too Exciting.
   49975: Fix for CLOUD-1663 - CloudConv - Regression: Search query containing wildcards is partially cut off on the results page (encoding is not being applied)
   49977: CLOUD-1640: Fixed external user site member visibility issue.
   50007: Fix to disallow change of own user role or removal in Site Member for the current user.
   50011: Activiti schema reference files ignore table column ordering (testing CLOUD-1675)
   50012: Reorganize repository database bootstrap beans to register scripts and patches with SchemaBootstrap (CLOUD-1675)
    - New Spring config file: alfresco/dbscripts/db-schema-context.xml
    - Split Repo, JPBM, AVM and Activiti scripts
   50013: Update module properties to reflect latest Alfresco stack requirement and set version to 2.0
   50014: Fixed CLOUD-1675: Upgrade failed from CLOUD1-BUG-FIX3 to HEAD-QA
    - Use module-friendly registration of create scripts
    - Note: Schema validation will report errors due to 2 Cloud-specific tables in the 'alf' schema namespace
   50018: CLOUD-1568: CloudConv - regression:created/modified time is not displayed in Properties section
      - Added unit test for combining default controls where a new data type is added, which was failing
      - Fixed DefaultControlsConfigElement.combine method
   50023: Fix for CLOUD-1578 - CloudConv - regression: Unable to join a site
   Fix for CLOUD-1579 - CloudConv - Regression: It's impossible to perform "Leave Site" action by Site Member from Site Dashboard
   50027: BDE-150 Create RPMs for Cloud deployment
   50028: ALF-18908: WebDAV litmus tests failing on HEAD-QA/CLOUD2
   50032: CLOUD-1624: CloudConv - regression: Login button is missing on Quick Share page
      - Moved CSS loading to quickshare/header.get.html.ftl
   50039: CLOUD-1626: networks not displayed via WebDAV (fix for PROPFIND)
   50040: CLOUD-1637 / MNT-8462 "Post" button works incorrectly
      - Added check for response type of string to userStatusUpdateSuccess and userStatusUpdateFailure since it's already coming back as a JSON object
   50047: Add missing dependency on java-property-utils-1.6
   50048: BDE-150: fix RPMs
   50051: Fix for CLOUD-1664 - CloudConv - Regression: New logo is not applied
   Fix for CLOUD-1580 - CloudConv - Regression: It's impossible to change the application theme
    - Fix to correctly handle "network admin" concept - manually allow the network admin to perform admin actions where appropriate - AFAIK this can never have worked correctly... remove nonsense runas=admin webscripts overrides that don't work anyway.
    - Clean up of related scripts.
   50055: CLOUD-1607: filter sent-invites-min.js coming from Enterprise build, so that it gets overridden by the non-minimised cloud one
   50070: Temporarily adding exploded Ant build for cloud2 environment. 
   This now means the same steps for building a cloud1 environment can be used to build a cloud2 environment.
   NOTE: There is one outstanding licence issue to resolve that will be fixed in a subsequent commit.
   50088: Remove unused or duplicate MyBatis config (CLOUD-1672)
   50090: CLOUD-1672: CloudConv: MyBatis error when downloadCleanerJob is run
    - Cloud was duplicating the MyBatis configuration
    - Created Cloud-specific SQL templates
    - Tested using sign ups and general use but full account and tenant usage needs to be tested
   50092: CLOUD-1591: CloudConv - Regression: Incorrect layout of "Link to Rule Set" page
      - Made the more specific rules-picker treeview width override lightTheme's overriding treeview width
   50094: Fixes for exploded Ant build.
   50097: Added ignore of projects/web-client/source/web/images/logo/alfresco_enterprise.gif which is apparently moved from elsewhere during some build step
   50099: CLOUD-1614: CloudConv - Regression: Incorrect label "Start workflow" displays instead of "Create Task"
      - Added page.startWorkflow.title to cloud localization files
   50101: BDE-154: upgrade urlrewritefilter to 4.0.4, avoiding compilation warning
   50102: CLOUD-1602: CloudConv - Regression - Chrome specific: Close (X) button doesn't work on "Alfresco Cloud information" window
      - Removed committed minified about-share-min.js and ant touch command which kept it in place
   50107: Merged HEAD-BUG-FIX to HEAD-QA (4.2) for CLOUD-1466: stop relying on a patched version of wss4j
      49973: Merged DEV to HEAD-BUG-FIX (4.2)
         49648: MNT-8652 Treat PasswordText as default for CMIS Web Service authentication (using patched version of wss4j)  
               Execute PasswordTypeInterceptor before WSS4JInInterceptor to add PasswordText type as default if Password element misses it. Add system test for case. 
      50076: Follow-up on MNT-8652: rename CXFAuthenticationTest into CXFAuthenticationSystemTest, so that it is not executed in web-service-client tests, but only in system-build-test
   50109: Fix to issue where application logo was resized and broke aspect ratio of uploaded image. Also changed size to valid for new header.
   50113: Fix for CLOUD-1576 - CloudConv - Regression: Incorrect notification is displayed when Site Admin performs "Leave Site" action
   50114: Fix for CLOUD-1662 - CloudConv - Regression: Incorrect behavior when searching with empty field
    - trim searchbox text before event publication
   50116: Cleanup of copy/pasted files...
   50117: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/HEAD-QA
      47811: ALF-18245 - BM-0013: Soak: Run 06: Search population of ScriptNode is expensive:
             Refactor Share search UI and REST API to provide server-side paging.
   50122: MNT-8480 - cloud sync and revert
   50126: BDE-150 Add build number as RPM release property
   50150: Merged V4.1-BUG-FIX (4.1.5) to HEAD-QA (4.2)
      << MNT-8721 Security fix from 4.1.4.2 >>
      << Merge direct from V4.1-BUG-FIX rather than HEAD-BUG-FIX as r49633 was merged with a block of other changes >>
      49633: Merged DEV to V4.1-BUG-FIX (4.1.5)
         49574: MNT-8473: Share's workflow-details page exposes all workflow instances to everyone
         Introduce WorkflowPermissionInterceptor that check if current user allowed to perform operation.
      49752: MNT-8473: Share's workflow-details page exposes all workflow instances to everyone 
         Fix errors that were found during unit testing.
   50153: ALF-18708: Merged V4.1-BUG-FIX to HEAD-QA
      << Security fix from 4.1.4.4 >>
         50151: MNT-8866: Merge V4.1.4 (4.1.4.4) to V4.1-BUG-FIX (4.1.5)
            49802: MNT-8725: CLONE - Security context for Alfresco Explorer is not being cleaned up after processing a request
               JSF phase listener, which cleans up security context for Alfresco Explorer requests. It is necessary for avoiding sharing of security context between Alfresco Explorer and CMIS services, based on OpenCMIS libraries
            49803: MNT-8725: CLONE - Security context for Alfresco Explorer is not being cleaned up after processing a request
               Configuration part of the fix has been reversed
            49804: MNT-8725: CLONE - Security context for Alfresco Explorer is not being cleaned up after processing a request
               JSF phase listener, which cleans up security context for Alfresco Explorer requests. It is necessary for avoiding sharing of security context between Alfresco Explorer and CMIS services, based on OpenCMIS libraries
   50164: Merged V4.1-BUG-FIX to HEAD-QA
      << Priority for transformer.remote.alfresco. Includes JMX controls for the Transformers subsystem >>
      49038: MNT-7158 Merge DEV to HEAD-BUF-FIX (4.2)
         - Addition of TransformerConfigMBeam (JMX bean) to control transformers dynamically
         - Transformer level config limits are now a default for mimetype specific values. Possible now that we don't have these in the Spring config.
           previously had been 'combined' which was not too clear. Also added system wide mimetype defaults.
         - All transformers are now 'known' to the content transformer registry - not just the ones that may be selected. i.e it knows about the component transformers.
         - TransformerSelector now round robins all equal priority transformers until they reach their thresholds, rather than doing so for each one in turn.
      49135: MNT-7158 Investigating adding priorities to transformers
         - Changes to make it possible to check debugTransformer.txt output in 4.1.5 against 4.2
      49190: MNT-7158 fix build failure testGetMaxSourceSizeKBytesPageSupports
      49207: MNT-7158 Investigating adding priorities to transformers
         - Modified priorities so that it is now deterministic
           Try as sourceMimetype of 00 in JMX op getTransformationsByExtension to double check
         - Changed default priorities 5 and 10 to 50 and 100 for EXPLICIT and DEFAULT to give more room in the future
         - Combined transformer.complex.AdobeIllustrator.Image with transformer.complex.PDF.Image as they were the same
           except for the transformer settings
         - TransformerDebug now uses [---] as the priority for compound transformers
         - TransformerDebug now includes Component in the type of compound transformers e.g. fred<<ComplexCompound>>
      49947: MNT-7158 Investigating adding priorities to transformers
         - Added limits based on use. So a limit may be set for "index", "doclib", "webpreview", "syncRule", "asyncRule" ...
      49985: MNT-7158 Investigating adding priorities to transformers
         - Allow <tomcat>/shared/classes/alfresco-global.properties to be used in transformers.
      50002: MNT-7158 Investigating adding priorities to transformers
         - Missing file
      50061: MNT-7158 Investigating adding priorities to transformers
         - Set up remote transformations 
            BinaryPassThrough.priority=20
            remote.alfresco.priority=30
            remoteServer.priority=40
      50143: MNT-7158 Investigating adding priorities to transformers
         - Show default values in getProperties, comment out values set to defaults and add under line transformer name
   50166: Merged V4.1-BUG-FIX to HEAD-QA
      << Two 4.1.4.4 hot fixes >>
      50165: Merged V4.1-BUG-FIX (4.1.5) to HEAD-BUG-FIX (4.2)
         50110: MNT-8844 - CSRFFilter disables https login
         50158: MNT-8870: Merge V4.1.4 (4.1.4.4) to V4.1-BUG-FIX (4.1.5)
            50120: MNT-8858: AJAX Servlet does not clean up security context after processing a request
               Modification for cleaning up security context after processing an AJAX request to 'org.alfresco.web.app.servlet.ajax.AjaxServlet'
   50169: CLOUD-1641: Made people-finder to use CannedQuery rather than Solr.
   50173: Fix for CLOUD-1587 - CloudConv - Regression: Advanced Search link should be unavailable.
   50174: Fix for CLOUD-1608 - CloudConv - Regression: Changing roles of site members is displayed only after page refresh
   Fix for ALF-18534 - Changing roles of site members is displayed only after page refresh
   50176: Fix for CLOUD-1592 - CloudConv - Regression: Content I'm Editing dashlet contains redundant info (about blogs, wiki, forum)
   50177: CLOUD-1689: CloudConv - Regression:Networks are not displayed via SPP
   50182: ALF-18702 : Tenant isn't able to log in Share once another tenant has logged in before.
   Fix for clearing tenant user domain and authentication context after the Repository webscript is executed.
   Copied the TenantLeakLogger from CLOUD to HEAD into org.alfresco.web.app.servlet package.
   50183: CLOUD-1606, CLOUD-1459: Fixed the permissions issue for the get preferences in the MailActionExecuter.
   50184: Changed default Cloud Share Hazelcast config to empty IP list rather than promiscuous multicast - which was much too saucy!
   50185: XSS attack hardening - incorrect use of ?js_string for safe HTML element IDs - should be ?html
   50197: Code tidy
   50200: ALF-18957: SchemaReferenceFileTest failing on Oracle
   Updated ACT schema-reference file for Oracle.
   50203: Fix for CLOUD-1613 - CloudConv - Regression: CLONE: Under selected Item menu the manage permission should be hidden
   50208: Fix CLOUD-1660 - CloudConv - Regression: Incorrect layout of tag icon on Search result page
   50211: Fix to (unreported?) issue where Colleagues dashlet would not show the user status relative time - showed empty value in brackets ()
   50215: DEVOPS-3172, CLOUD-1701: cloud2/HEAD-QA unable to startup in DP environment.
   50227: CLOUD-1612: CloudConv - Regression: Incorrect location of help icon for "Message" field on "Create Task" page
      - Moved rendering of help element
      - Added CSS for desired positioning
   50245: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
      50240: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/HEAD-BUG-FIX:
           50221: Merged DEV to V4.1-BUG-FIX (4.1.5)
                50030: Attempt a workaround for MNT-8704: WebDAV:Content does not disappear after being deleted
                 - Deprecate various methods related to the existing WebDAV use of sys:hidden
                 - Put in a timer task on use of the sys:hidden aspect in WebDAV DeleteMethod
                50093: MNT-8704: WebDAV:Content does not disappear after being deleted
                - "if (!fileFolderService.isHidden(nodeRef))" block was moved to deleteHackRunAs.doWork().
                50187: MNT-8704: added node existence check; unhiding node prior to deletion.
                As per Derek's comment:
                https://issues.alfresco.com/jira/browse/MNT-8704?focusedCommentId=227689&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-227689
   50251: CLOUD-1702: Fixed NPE in WorkflowPermissionInterceptor, also fixed the issue that when the invitee tries to click on the link in the invitation email, 'org.alfresco.service.cmr.security.NoSuchPersonException' is thrown.
   50298: Fixed the failing unit tests as a result of the newly added WorkflowPermissionInterceptor.
   50306: Fix to merge causing ALF-18979 - Activiti servlet references on by default in web.xml
   Removed duplicated class now that the LoggerFilter is part of code webclient code
   50311: MNT-8890: Commented the newly added method in TenantRepositoryContainer in order to fix the failing unit tests.
   50318: Generate a jar of tests for alfresco-cloud, for consumption by QA tests later
   50322: Fix for CLOUD-1657 - CloudConv - Regression: Admin section in the Header should be located in the user's menu having name "Account settings"
   50335: ALF-18702 : Tenant isn't able to log in Share once another tenant has logged in before.
   Fixed failing JUnit tests.
   Reverted 50311 revision.
   50337: CLOUD-1699: Cloud example content thumbnails - some have the wrong width and look rubbish in doclib/search results
      - Added new versions of doclib for Data Sheets to sampleContent.acp
      - Added doclib and imgpreview for all content in sampleContent.acp except 'Alfresco Cloud Intro.mp4'
   50345: ALF-18702 : Tenant isn't able to log in Share once another tenant has logged in before.
   Fixed failing JUnit tests.
   50352: Fix for CLOUD-1691 - Incorrect notification when leaving name field empty through inline edit
    - fixes the issues where; length validator not fired, order of validators wrong for cm:name inline editor, fixes issue where previously validation would still be shown on reedit of field after Cancel << hat tip to Mr Draper for validation solution
   50353: Fix for CLOUD-1604 - CloudConv - regression: Links on "Oops page" should be highlited.
    - also removed duplicate messages and cleaned up message text from the late 90's.
   50356: Fixed CLOUD-1697: URL rewrite filter upgrade causes additional logging
   50357: Fixed the failing unit tests which were failing as a result of rev: 50335 commit.
   50374: Revert r50182 and the subsequent changes made to fix the fallout: r50311, r50335, r50345, and r50357
   50379: CLOUD-1669: update Eclipse JibX launchers with the upgraded JibX 1.2.5 jars
   50390: Revert the part of r50306 that updated enterprise-web-scripts-application-context.xml and deleted TenantLeakLogger.java.
   This was necessary following the reverts that took place at r50374.
   50396: Corrected name of content transform test class file.
   50397: Added new "transform" folder (which should have been there before)
   50398: Move content transform test class file into the new "transform" folder.
   50401: - Added two Eclipse projects: one for the thor private module ("Alfresco Cloud") and one for its dependencies ("Cloud Dependencies").
   - Turned the JiBX builder on by default in the data-model project.
   50410: MNT-8890: split classpath when executing JUnit tests in Ant, so that repository tests do not get classes of upstream projects
   50411: MNT-8890 follow-up
    - make enterprise repository tests run with a reduced classpath too, otherwise EntRepoCacheStopTest fails
    - add wdrdeployment classes to reduced classpath, otherwise enterprise tests cannot find alfresco/bootstrap/deployedSpace.xml
   50416: Removed unused component (no longer required in 4.2 so the override isn't required)
   50417: Dialog styling tweaks
   50422: Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/HEAD-QA
      50409: Fix for CLOUD-1721
   50473: CLOUD-1726 CLOUD-1732: move tests CMISChangeLogServiceTest and SubsystemsTest from repository to remote-api, because they depend on resources in remote-api (follow-up of MNT-8890)
   50474: CLOUD-1736 Shouldn't have tweaked the classpath of system-build-test, since it already has its own (follow-up of MNT-8890)
   50479: ALF-18927: SPP: Incorrect information is displayed on Event Information window for yearly recurrect event
   BYMONTHDAY shouldn't be deleted for YEARLY recurrence.
   Also setting interval was not accurate.
   50480: ALF-18927: SPP: Incorrect information is displayed on Event Information window for yearly recurrect event
   Additional check in.
   50485: Fixes ALF-18702: Corrected the logic for how tenant switching is achieved so that both Enterprise and Cloud scenarios are catered for.
   50495: Fix for ALF-18981 - Non-ASCII characters are not displayed in Share interface correctly
    - Fix to deal with issue where a valid JSON result string is not always valid JavaScript text e.g. some unicode characters etc.
   50498: svn ignore patterns
   50499: files should not be in svn
   50500: remove eclipse folder settings from svn
   50505: Fix to (unreported?) search results paging issue - merge error meant that only the first page of results would ever be returned no matter what page was selected, but who goes past the first page anyway eh?
   50516: CLOUD-1718: "CloudConv - Regression:"Imap Attachments" and "IMAP Home" folders are displayed via CMIS Workbench client"
   50517: CLOUD-1727: CloudConv - Regression - WebDav: The mapped network drive could not be created on Windows
   This was broken by MNT-2823.
   50524: CLOUD-1665: New accounts are not available for CLOUD2
   Manually merged revision 48796 as it was mistakenly marked as merged.
   50525: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA:
      50033: (RECORD ONLY) Merge HEAD-QA to CLOUD1 (for BDE-109: generate coverage on unit tests)
           Merge V4.1-BUG-FIX to HEAD-QA
              48904: BDE-109: generate coverage statistics from JaCoCo when running tests
              48925: 3rd party classpath refers to available mysql-connector-java-5.1.13-bin.jar
              49065: Limit coverage to org.alfresco classes, otherwise overhead is too big and tests too slow 
              49474: MNT-8668 Remove Maven declared dependency on addressing-1.0.mar
              49655: BDE-109 new Ant task to generate JaCoCo report for test coverage
   50582: Removed and ignored .classpath and .project
   50614: CLOUD-1713 append the Cloud build number after the Enterprise build number, as in: r50345-b65-c129
   Upgrade a few Maven plugins
   50649: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA:
      50083: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3 to BRANCHES/DEV/CLOUD1:
           49357: New Cloud Bug Fix Branch
           49363: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3:
                46487: Fixes CLOUD-1293: "Other" included in total activities count. Refactor activity groupings.
                46488: Fixes: CLOUD-1310: Adds "no-wrap" to last element to that the second link all appears on the same line.
                46493: Fixes: CLOUD-1229: Removes max-width CSS constraint so that table cells can expand to find room for long transltions.
                46535: PUBLICAPI-63: "Unable to list comments associated to a document : Malformated comment object ?": fix + tests
                46555: PUBLICAPI-90: "You can not remove yourself from a site using the -me- identifier"
                46826: Fix for CLOUD-1368 - Tomcat thread blocking during concurrent user testing causing service to become unresponsive.
                47249: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2
                     47243: Fix for ALF-18194 - Bad performance with multiple contentstores browsing files on the slower stores
                47681: Merged HEAD to CLOUD1-BUG-FIX2
                     47448,47484,47504,47518,47552
                47865: GERMAN: Latest translation updates, based on EN r46485 & including fixes from check report.
                47866: FRENCH: Latest translation updates, based on EN r46485 & including fixes from check report.
                47867: SPANISH: Latest translation updates, based on EN r46485 & including fixes from check report.
                47868: ITALIAN: Latest translation updates, based on EN r46485 & including fixes from check report.
                47869: JAPANESE: Latest translation updates, based on EN r46485 & including fixes from check report.
                47885: ALL LANG: Minor update to translations to bring them in line with EN r47485
                48355: CLOUD-1458: Added MailActionExecuterTest to ActionTestSuite.
                48402: CLOUD-1458: Remove inadvertently added test class
                48561: CLOUD-1458, CLOUD-1459, CLOUD-1479, CLOUD-1485 - Fix MailActionExecuter to correctly resolve primary domain for sender and recipients.
                47249: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2
                     47243: Fix for ALF-18194 - Bad performance with multiple contentstores browsing files on the slower stores
                47681: Merged HEAD to CLOUD1-BUG-FIX2
                     47448,47484,47504,47518,47552
                47865: GERMAN: Latest translation updates, based on EN r46485 & including fixes from check report.
                47866: FRENCH: Latest translation updates, based on EN r46485 & including fixes from check report.
                47867: SPANISH: Latest translation updates, based on EN r46485 & including fixes from check report.
                47868: ITALIAN: Latest translation updates, based on EN r46485 & including fixes from check report.
                47869: JAPANESE: Latest translation updates, based on EN r46485 & including fixes from check report.
                47885: ALL LANG: Minor update to translations to bring them in line with EN r47485
                48355: CLOUD-1458: Added MailActionExecuterTest to ActionTestSuite.
                48402: CLOUD-1458: Remove inadvertently added test class
                48561: CLOUD-1458, CLOUD-1459, CLOUD-1479, CLOUD-1485 - Fix MailActionExecuter to correctly resolve primary domain for sender and recipients.
           49371: PUBLICAPI-166: "Unable to upload large file on Cloud  (> 5MB)"
           49389: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3:
                49295: CLOUD-1529: Made SessionIndex optional in the SSO response. Also commented out 'autoProvisionEnabled' and 'alfrescoLoginCredentialEnabled' from the SAMLConfigSettings as they are not implemented yet.
           49406: CLOUD-1488: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3 (Also added the missing elements from the merge):
                ALF-16480: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
                 43252: MNT-166: Document lock not removed after the lock expiry date has been reached
                     -  Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator.
                 43253: MNT-165: "Cancel Editing" does not completely remove lock from document
                     - Added documentLibrary cancel editing action for locked documents.
                 43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified)
                 43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document.
                 43311: MNT-165: "Cancel Editing" does not completely remove lock from document
                     - Fix for page refresh problem when cancel editing on details page
                 43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files
                     - Change evaluator.doclib.metadata.isLocked to break circular dependency
                 43755: MNT-202: Upload New Version not available for a document that has been edited offline
                     - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc).
           49463: CLOUD-1510 - Cache remote transformation calls to isTransformable
               - Make TransformationOptions serializable
               - Expose ehcache statistics and configuration, via JMX
           49492: CLOUD-1510 - Fix broken unit test
           49631: CLOUD-1455: "Hide activity in a site from the activity feed"
           49662: CLOUD-1455: "Hide activity in a site from the activity feed": fix broken unit test
           49759: Merged BRANCHES/DEV/HEAD-QA to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3:
                49758: Fix for CLOUD-1542, Google Docs action was missing from the action list in the document library.
           49814: CLOUD-1455: "Hide activity in a site from the activity feed"
           49866: CLOUD-1597: Added the missing evaluators.
           49948: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3:
                49880: Update Google Docs integration from 2.0.2 to 2.0.3.
           50045: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3:
                50043: Update 2.0.3 AMPs
   50686: GERMAN: Latest translations and updates based on EN rev49789. Jira fixes: MNT-7526, ALF-18650, ALF-18523, ALF-18521, ALF-18255, ALF-18069
   50689: SPANISH: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255
   50691: FRENCH: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255
   50693: ITALIAN: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255
   50694: JAPANESE: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255
   50695: DUTCH: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255
   50696: RUSSIAN: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255, ALF-18504, ALF-18503, ALF-18502, ALF-17793
   50699: CHINESE: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255, MNT-8874, MNT-8874, MNT-8874
   50709: CLOUD-1699: Cloud example content thumbnails - some have the wrong width and look rubbish in doclib/search results
      - Fixed imgpreview for Alfresco Mobile.pdf
   50711: Merged DEV to HEAD-QA (4.2.0)
      50482: ALF-18996 : Upgrade from 3.4.12 to 4.2.0 fails: ERROR [domain.schema.SchemaBootstrap] [localhost-startStop-1] Statement execution failed: SQL: ALTER TABLE ACT_RU_TASK MODIFY ASSIGNEE_ VARCHAR(255) Error: Table 'alfupg.ACT_RU_TASK' doesn't exist
         - Correctly handle activiti tables creation/upgrade when performing upgrade from 3.4.x.
   50728: CLOUD-1754 do not fail the build as soon as tests fail: we are now quarantining tests in Bamboo, so installers need to be built regardless
   50755: Merged HEAD-BUG-FIX to HEAD-QA
       50754: Merged V4.1-BUG-FIX (4.1.6) to HEAD-BUG-FIX
          50753: Merged DEV to V4.1-BUG-FIX (4.1.6)
             50727: MNT-3368: BM-0013: Soak: Run 08: OnPremiseSyncPullJob runs without a transaction
              - Add transactions. 
              50750: MNT-3368: BM-0013: Soak: Run 08: OnPremiseSyncPullJob runs without a transaction
              - Correction for 'readOnly' parameter. 
   50759: Merged BRANCHES/DEV/JAMAL/Fast_Test into HEAD-QA (CLOUD-1680: Make thor tests run blazingly fast)
      50635: CLOUD-1680: Make thor tests run blazingly fast.
      50684: CLOUD-1680: Regouped a few of the public api tests.
      50688: CLOUD-1680: Regouped a few of the public api tests.
      50706: CLOUD-1680: Moved the excludedGroups from the parent pom to thor. Also grouped the webdav tests.
      50710: CLOUD-1680: Deleted the un-necessary junit category.
   50773: Fixing up the tests to separate out the cloud tests.  MailActionExecuter should now get the locale correctly.
   50779: Redundant file
   50780: Redundant File
   50782: Redundant File
   50783: Fixed missing double quote
   50784: Missed strings included
   50785: Missed key included
   50795: ALF-19035 - MT Cloud Policies run with inconsistent "short" base and "full" node refs.
   50823: ALF-17548: Disable Google Docs v1 integration
     * MBean controlling the subsystem has been removed (commented out) from bootstrap-context.xml
     * Admin console web script org/alfresco/components/console/repository/google-docs.get has been removed
     * Admin console form config has been deleted from share-form-config.xml
     * No changes have been made to the installer, as I could find no evidence that the configuration of the v1 subsystem was being changed by it
     * Note: The subsystem property 'googledocs.googleeditable.enabled' was already set to false.
   50825: ALF-17548: Fix status web script which assumed the presence of the Google Docs v1 MBean removed in r50823. Now the web script returns enabled: false if the bean is not present.
   50827: CLOUD-1600: CloudConv - regression: Cannot add a tag through inline edit option
      - Added ignoreEmpty argument to accommodate changes in r50352
   50831: CLOUD-1770: Redundant Perform Action ("Embed properties as metadata in content") is displayed for Content Rules
      - Moved embedder action to sample file since we don't supply any embedders out-of-the-box
   50833: CLOUD-1770: Redundant Perform Action ("Embed properties as metadata in content") is displayed for Content Rules
      - Programmatically created executer rather than loading from context
   50838: Cloud: Patch overrides
    - Moved live patches to 'module-schema-context.xml' ('patch.redeployProcessesWithReminders2' and 'patch.redeployProcessesWithReminders3')
    - No Sample Web Site in Cloud: (CLOUD-1480) Created no-op patch for 'patch.siteLoadPatch.swsdp'
    - IMAP is disabled in Cloud: (CLOUD-1743): Created no-op patch for 'patch.imapFolders'
   50839: ALF-18702: Tenant isn't able to log in Share once another tenant has logged in before
     Following review, added logic in AuthenticationServiceImpl.authenticate that is similar to AuthenticationServiceImpl.validate in order to handle case where the tenant is determined by the requested URI
   50851: First part of fix for ALF-19052.
   50853: ALF-18096: Integrate document security AMP files from the Alfresco Mobile iOS 1.5 project
     * New aspect dp:restrictable
     * Form configuration for properties provided by this aspect
     * Note: As detailed on the ticket the source files have been copied into the repository and slingshot project and mofified there.
   50864: Fix for CLOUD-1769 CloudConv - Admin section in header menu instead of Account Settings are available for free account user
   50879: ALF-18914 : SPP: It's possible to create meeting with empty subject field linking to an existing workspace
   Added a check for an empty subject when creating a meeting from iCal.
   50922: Revert r50853 mistakenly adding Mobile project dp:restricted aspect to HEAD-QA
   50925: CLOUD-1759: Fixed most of the Sonar ‘Critical’ violations.
   50937: CloudConv - Regression - CLONE - No notification is displayed when performing "Leave Site" action
   50938: Added Cloud override to remove MyFiles and Shared links from toolbar
   50941: Fix for     CLOUD-1768   CloudConv - Regression - CLONE: It's impossible to find the user by any property except the username
      and          CLOUD-1778   CloudConv:in people search first name and last name people search always return zero results
   50942: Fix for CLOUD-1741 - CloudConv: User should be redirected to Alfresco Cloud Documentation instead of Alfresco Community 4.2 Documentation. Comical spelling error in config.
   50945: GERMAN: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729
   50946: FRENCH: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763
   50947: SPANISH: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763
   50948: ITALIAN: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763
   50949: JAPANESE: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763
   50957: Fix for CLOUD-1623 Unfriendly warning appears when user try to create private site with the same URL
   50960: CLOUD-1772: Configuration files have been localized 
    - Removed all pointlessly translated configuration files
   50961: MNT-8480 : New web script for delete audit entry.
   50968: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA:
      50624: (RECORD ONLY) Delete generation of installers in continuous, to allow 'amber' builds
   50973: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA:
      50568: Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/CLOUD1
            50423: Merged PATCHES/V4.1.1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY
                      44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap
                      44130: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap
                      44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap
                   Merged PATCHES/V4.1.4 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY
                      45951: Fix for ALF-17687 BM-0013: Soak: Run 02: SolrJSONResultSet must preload nodes
      50622: Fix for CLOUD-1751   Users searching in their home tenant (or other person related operations) should not be subject to visibility checks
      50664: Fix for CLOUD-1751   Users searching in their home tenant (or other person related operations) should not be subject to visibility checks
   50976: CLOUD-1634: CloudConv - regression: Upload form is not closed automatically after upload limit error occurs
      - Added Javascript to hide upload status and show upload control again
   50992: Changing the modifiers for the "addAuthorityNameIfMatches" methods from "private" to "protected" to allow the RM module do RM specific changes without copying a lot of the existing code. 
   50993: Fix for ALF-18850 - Incorrect label "page.ruleEdit.title" on New Rule page from Repository Browser
   51031: CLOUD-1761: Activity is not generated when deleting document via SPP/WebDAV - fix part 1
   This is the first part of a fix: activities were not being raised due to MNT-181 fix. This is now fixed. However, the posts are not being processed properly, which also needs fixing.
   51083: Fixed the failing test (testHasSite)
   51085: First part of fix for CLOUD-1787
   51091: CLOUD-446: Remove 'overridden' googledocs subsystem bean from Cloud override context, which was causing the subsystem to start up still
   51092: Fix to URLRewrite config rule to correct escape UTF-8 characters either side of the detected '@' character when rewriting URLs where browsers have not correctly dealt with the @ character.
   51097: Updated BG for ludicrous screen resolution CLOUD-1795
   51098: Fix for CLOUD-1795 - Login dialog centre on window resize
   51103: Fix for CLOUD-1796 CloudConv:-Search pagination to other pages no results are shown
   51105: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
      51104: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/HEAD-BUG-FIX:
           51101: MNT-8704: node was not being unhidden (thread local client marker needed setting)
   51107: Improvements to search result list handling - only populate node result structures for the items that are going to be returned.
   51140: Minor tweaks to search processing hand merged from 4.1.N
   51163: JAPANESE: Fix for CLOUD-1799
   51170: ALF-18074 add a new flag to enable clustering.
   51184: Make cloud tests depend on repository test resources, to be able to reuse them
   51234: CLOUD-1800: Made the Rules to be executed asynchronously in the cloud by overriding “rule-edit.js”.
   51245: Merged BRANCHES/DEV/HEAD42-MERGE to BRANCHES/DEV/HEAD-QA
      51230: Addition of a modified YUI Compressor ANT task to speed up the minimize-slingshot-deployed-javascript build step - from around 3 mins on most machines down to 3 secs. w00t
   AND THIS IS THE RESULT:
   ant clean incremental-webclient-tomcat-exploded incremental-slingshot-tomcat-exploded
   ...
   BUILD SUCCESSFUL
   Total time: 1 minute 18 seconds
   51248: Merged HEAD-BUG-FIX to HEAD-QA
      51247: Merged V4.1-BUG-FIX to HEAD-BUG-FIX (RECORD ONLY)
         51246 (RECORD ONLY): Merged PATCHES/V4.1.5 to V4.1-BUG-FIX
            51233: MNT-8129: NPE - Servlet.service() - getGlobalConfig for "webClientConfigService"
                Missing JGroups messages receiver has been added to handle cluster messages correctly.
                Port range default value has been increased to add some slack around required ports
         50999 (PARTIAL RECORD ONLY): Better logging for AsynchronouslyRefreshedCache (MNT-8129)
   51273: Partial fix for CLOUD-1806. This checkin fixes serialisation of TransformationSourceOptions objects.
   A subsequent check-in will fix deserialisation.
   51275: Fixed CLOUD-1804
   51279: Allow calls to NodeDAO.getParentAssocs to succeed for deleted nodes
    - The error message reported is incorrect.  Previously, no calls were made to the DAO to
      retrieve details for deleted nodes.  There was therefore an assumption that the node had been
      internally referenced and that this represented an error.  This is no longer the case (nor has it
      been for a some time).
    - In this case, the SOLR tracking attempts to get the parent associations for all nodes,
      regardless of their state of deletion.
    - CLOUD-1807: CloudConv: I get the following error in the solr nodes "Detected stale node entry: NodeVersionKey"
    - MNT-9072: SOLR tracking can be delayed by node deletion 
   51291: JobLockService.releaseLock is not optimistic
    - AcquireLockException is no longer thrown if the lock token is invalid
    - releaseLock returns a boolean to indicate whether the lock was removed or whether it was already gone
    - Prevents unnecessary retrying withing JobLockService implementation (ALF-19098)
   51292: Fix thread safety in PostLookup w.r.t. job lock state; general logging improvements (ALF-19098)
   51293: Fix build after rev 51291 (ALF-19098): JobLockService.releaseLock is now optimistic
   51305: Remainder of fix for CLOUD-1806. RemoteAlfrescoTransformer is unable to serialize transformation options as JSON.
   This check-in just changes Jackson configuration to handle the new TransformationSourceOptions which are now part of TransformationOptions.
   As this field needs to be JSON serialised along with its containing TransformationOptions instance - and particularly because TransformationSourceOptions
   is not a concrete type - we need extra Jackson config in order to correctly marshall and unmarshall the actual concrete types of any instances of TransformationSourceOptions.
   51307: Slight tidy-up of fix for CLOUD-1806.
   I had specified some Jackson config in 3 subclasses and didn't need it as it was already configured on a base type.
   51315: Fix on HEAD-QA only for ALF-19101, which I believe may affect CLOUD-1806.
   A typo in a TransformationSourceOptions method breaks the JavaBeans contract and imperils the JSON serialisation needed for CLOUD-1806.
   I think the method with the typo has been published (in 4.1?) so rather than rename it, I've deprecated it and added a new one with the correct spelling.
   51350: Preparatory work for fixing CLOUD-1754. MailActionExecuterTest failing.
   It has been very difficult to get reliable test feedback on dealing with the MailActionExecuter.
   This is largely because of the difference in the way mail actions are handled in cloud and on enterprise.
   Therefore I have refactored and extended our test code to support fixing the MailActionExecuter.
   Part 1: Refactor the JUnit Rules AlfrescoPeople, AlfrescoPerson, AlfrescoTenant so that when a test is run in
   Community, Enterprise or Cloud the test 'does the right thing' when creating/tearing down test users.
   i.e. On Community/Enterprise, create the user/auth and the person on the single tenant.
   In Cloud create the user in system tenant, create the person in their home tenant, precreating the tenant if necessary
   and tear the whole thing down again.
   I achieved this by having the cm:person-related rules delegate to a spring bean responsible for dealing with test users.
   Then I've got a mechanism to let Enterprise override Community and Cloud override Enterprise.
   So the Community 'TestUserComponent' just creates/deletes users. Enterprise 'inherits' this behaviour.
   The Cloud TestUserComponent deals with the tenant sideshow.
   It's all started in the global-integration-test-context.xml.
   51351: Adding the JIRA number for BDE-173 into this file.
   51353: Fixing some test fallout from pervious commit (51350) which was part of preparatory work for fixing CLOUD-1754.
   Looks like the SyncAudit tests were using ApplicationContextHelper's getApplicationContext method having already started a custom app context?
   51371: Merged BRANCHES/DEV/HEAD42-MERGE to BRANCHES/DEV/HEAD-QA
      51277: Fix for ALF-18948 - Share Hazelcast cluster configuration change required in 4.2
      51313: Minor css improvements to search box
      51367: Fixed order of button styles for lightTheme overrides
      51368: Fix to broken css file - erroneous end comment marker
      51370: Fix for CLOUD-1795 - Login screen isn't resizing to display window
   51406: CLOUD-1573: CloudConv - regression:Preview is not displayed for locked document
      - Added check for presence of container element before attempting setup of document versions data table
   51407: Fix for CLOUD-1754. MailActionExecuterTest test failing.
   The code in MailActionExecuter needs some refactoring. As it was, validation of the mail recipients (are they usernames? email addresses? do the users exist? etc) are not the same for the to-many parameter as they are for the 'to' parameter. There are various other inconsistencies in the code also. I have tried to fix the cases where the inconsistencies are obvious and I've tried to imporove the test coverage too. This code has now become a little too complex and a future JIRA will lead to simplification. Currently the priority is to complete code convergence.
   51410: Fix for     CLOUD-1641   CloudConv - Regression: User from other domain cannot be found
   - cloud queries for people use all a users domains (OK until we partition by tenant)
   Fix for     CLOUD-1768  CloudConv - Regression - CLONE: It's impossible to find the user by any property except the username
   51422: Partial revert of r51410 where accountService was apparently added to the wrong bean definition
   51424: Correct wire up for R 51410 related to
   Fix for     CLOUD-1641   CloudConv - Regression: User from other domain cannot be found
   - cloud queries for people use all a users domains (OK until we partition by tenant)
   Fix for     CLOUD-1768  CloudConv - Regression - CLONE: It's impossible to find the user by any property except the username
   51429: CLOUD-1641: User from other domain cannot be found
   Removing previous fix for CLOUD-1641, the back-end should decide the best route to go depending on the parameters provided. Forcing the query to use a canned query has caused CLOUD-1768.
   51444: Fix for     CLOUD-1641   CloudConv - Regression: User from other domain cannot be found
   Fix for     CLOUD-1768  CloudConv - Regression - CLONE: It's impossible to find the user by any property
   - ignore tenant filter for cloud people query and rely on post query visibility filtering (to see people from other tenants invited in)
   51466: Fix for     CLOUD-1641   CloudConv - Regression: User from other domain cannot be found
   Fix for     CLOUD-1768  CloudConv - Regression - CLONE: It's impossible to find the user by any property
   - exclude permission evaluation when searching for people in the cloud (covered by the visibility stuff)
   51553: CLOUD-1780: CloudConv :- follow button is visible for external user as well
      - Refactored customizations for new dependency loading to fix order of loading
      - Refactored widget userHomeTenant option addition for new instantiation pattern
      - Refactored override of widget's _renderFollowingActions method with new CloudPeopleFinder object that extends PeopleFinder
   51571: Merged HEAD-BUG-FIX to HEAD-QA
      51473: Moved CacheTest back into Repository
      Note for Cluster features: This change no longer relies on any distributed caches and therefore
                                 the new files should just stay as they are and the old ones removed.
   51583: Merged HEAD-BUG-FIX to HEAD-QA
      51477 Merged V4.1-BUG-FIX to HEAD-BUG-FIX
         50995: Support for locking and unlocking of values in the TransactionalCache
                - Infrastructure for MNT-8997: Support definitive writes for TransactionalCache
                - Allows a definitive write (put or remove) call to be made to the TransactionalCache
   51584: Merged HEAD-BUG-FIX to HEAD-QA
      51478: Merged V4.1-BUG-FIX to HEAD-BUG-FIX
         50997: Make use of TransactionalCache's locking ability
                - MNT-8997: Support definitive writes for TransactionalCache
                - PersonServiceImpl and AuthorityDaoImpl both do cache modificiations in 'beforeXYZ' callbacks,
                  which leaves room for further attempted cache updates by other callbacks.
                  Reapplied the fixes using TransactionalCache locks
         51327: Fix  CLOUD-1698 Intermittent invite test failures
                - Uses MNT-8997: Support transactional locking for Authentication Cache removal
   51635: CLOUD-1812 Fix invalid license issue: modify version.properties to have version.label=Cloud and version.edition=Enterprise
   51739: Merged HEAD-BUG-FIX (4.2) to HEAD-QA
      << Low risk change to avoid NPE found testing remote alfresco transformation nodes in DP env >>
      51738: Merged V4.1-BUG-FIX (4.1.6) to HEAD-BUG-FIX (4.2)
         51731: Avoid NPE in ContentServiceImpl.debugActiveTransformers(). Relates to MNT-7158 Investigating adding priorities to transformers
   51752: CLOUD-1812 Fix version.label to simply add a '-Cloud' suffix.
   51753: CLOUD-1822 Change RPM installation folder from tomcat6 to tomcat7
   51760: CLOUD-1385: "Sending a PUT request without a Content-Type header resets the contents mimetype to application/octet-stream" - CMIS was not correctly parsing the mime type header
   51779: Depend on Spring Surf 1.2.0-M6 (r1265) rather than a SNAPSHOT version
   51780: Depend on Spring Surf 1.2.0-M6 (r1265) rather than a SNAPSHOT version
   51783: Merged HEAD to BRANCHES/DEV/HEAD-QA (RECORD ONLY)
      49055:
         ALF-15191: Saving files (new or existing) to Alfresco via CIFS using iWork Pages or Numbers results in invisible files
         Modify HiddenAspect to hide node with explicit='false' by default.
      49062:
         ALF-15191: Saving files (new or existing) to Alfresco via CIFS using iWork Pages or Numbers results in invisible files
         Revert changes that were mistakenly committed.
         Rolled back to r49054
      49075:
         Merged BRANCHES/DEV/HEAD-QA to HEAD:
            49074: ALF-18573: exclude module-context.xml from alfresco-spp-config.jar
      49245:
         Merged HEAD-QA to HEAD (RECORD ONLY)
            49244: Switch version of mvninstall to 4.2.0-QA-SNAPSHOT
      49442:
         CLOUD-1541: "CloudConv: REGRESS - can't connect to cmisatom on HEAD (works on HEAD-QA)": spurious chemistry library appeared
      49599:
         CLOUD-1541: "CloudConv: REGRESS - can't connect to cmisatom on HEAD (works on HEAD-QA)": spurious chemistry library appeared
      49980:
         Merged BRANCHES/DEV/HEAD-QA to HEAD:
            49458: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
                 49117: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/HEAD-BUG-FIX:
                      49111: - Revert of r47645
                             - Change of imgpreview thumbnailDefinition to mimetype and size expected for HEAD
                             - Relates to ALF-5051 and MNT-8599 / ALF-18726
                 49118: Restored high resolution placeholder icons for imgpreview, relates to ALF-13984
            49979: ALF-18726: Alfresco could not start with WCMQS applied
                 - Updated RenditionServiceIntegrationTest with new imgpreview values
   51793: Increase size of in-transaction "nodeOwnerCache" to 40K items.
   51819: CLOUD-1385: "Sending a PUT request without a Content-Type header resets the contents mimetype to application/octet-stream" - add further tests not covered by original fix
   51836: TenantUtil now gives a bit more information when exceptions pass through (CLOUD-1685)
   51837: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA:
      51502: Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/CLOUD1:
           50389: Created branch for Cloud1 Security Release
           50395: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIXSF to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY:
                49713: Branch for SalesForce bug fix merges
                49718: Fix for CLOUD-1590 - Session fixation on Cloud specific login page
                49721: CLOUD-1589 Protect Login-page against XSS Cross-Site Scripting attacks
                50320: CLOUD-1653: Improve password strength
                    * Password length constraint previously contained in client-side files has now been removed and is now loaded from the 'Users' scoped config
                    * Minimum password length is increased to 8 characters from 6 previously
                    * The length requirement has been augmented with restrictions on the content, contained in a <password-content> element
                      - A minimum number of uppercase, lowercase, numeric and special characters can be specified
                      - The system-wide default is zero for these new restrictions (i.e. no restrictions)
                    * Alongside the existing <users> element, <network-users> allows the password length or content policies to be tightened for specific networks
                      - Example config is provided in cloud-config.xml showing showing how to do this
                    * Cleaned up existing validation messages and added a custom message based on the content restrictions, where this is configured
                      - Due to ALF-18975 the message appears with raw HTML visible for now
                    * IMPORTANT NOTE: No checking of submitted password values takes place (as before). Users can by-pass the length and content checks by mimiking the web browser themselves.
                      - It is not feasible to add this as part of this work unit, since there are multiple form targets in use, some of which are in the repository. There are no password policies defined in the repository, so these would need adding.
                50358: CLOUD-1707: Regress: Copyright logo is incorrectly encoded on Login and My Dashboard pages for French locale
           50408: CLOUD-1468: Red bar in Tasks "error loading items".
           50409: Fix for CLOUD-1721
           50413: Merge of rev 50185 - XSS attack hardening - incorrect use of ?js_string for safe HTML element IDs - should be ?html
           50576: Merged alfresco/BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIXSF to alfresco/BRANCHES/DEV/FEATURES/CLOUD1-SECURITY:
                50518: ALF-19012: Form validation messages shown in Bubble widgets are not consistent with the input title attribute value
                50574: ALF-18975: HTML in forms validation messages appears as raw HTML in the UI
                    * HTML messages added via Alfresco.forms.Form.addValidation() method no longer escape HTML entities in validation messages presented to the user
                    * The 'message' parameter in addValidation() can now be an object with separate 'html' and 'text' properties. Not all methods of displaying messages to the user support HTML.
                      - If no separate HTML and text values are supplied, the message is assumed to be HTML and is converted to text by removing HTML elements via a regexp
                50575: CLOUD-1653: Supply separate HTML and text validation messages for password content validation failures, since HTML cannot always be displayed
           50577: CLOUD-1653: Use separate HTML and text validation messages for Reset Password and Account Completion pages
           50731: CLOUD-1722: Apply config for Aetna specific password policy.
           50745: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY:
                50622: Fix for     CLOUD-1751   Users searching in their home tenant (or other person related operations) should not be subject to visibility checks
                50664: Fix for     CLOUD-1751   Users searching in their home tenant (or other person related operations) should not be subject to visibility checks
           50748: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY:
                50568: (RECORD ONLY) Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/CLOUD1
                      50423: Merged PATCHES/V4.1.1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY
                                44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap
                                44130: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap
                                44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap
                             Merged PATCHES/V4.1.4 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY
                                45951: Fix for ALF-17687 BM-0013: Soak: Run 02: SolrJSONResultSet must preload nodes
                50624: (RECORD ONLY) Delete generation of installers in continuous, to allow 'amber' builds
           50869: CLOUD-1773: Cloud1Security branch build8. User cannot create site
           50872: CLOUD-1653: Ensure password policy is always loaded based on home network, rather than the current context, which could be different.
           51156: CLOUD-1653: Add global flag to regexps to ensure that the number of digits and symbols is correctly counted
           51175: CLOUD-1682: "Hidden File Rename is Broken": fix and make sure the hidden aspect tests run as part of the build
           51183: CLOUD-1682: "Hidden File Rename is Broken": fix up test suite
           51187: CLOUD-1682: "Hidden File Rename is Broken": try again
           51349: CLOUD-1682: "Hidden File Rename is Broken": further tests, deal with hidden aspect manipulation by clients during rename
           51383: CLOUD-1682: "Hidden File Rename is Broken": deal properly with all client controlled hidden aspect cases
   51843: CLOUD-1815: OPTIONS request for force.com not returning 200
   Removed comment around publicapi URL pattern for CORS filter.
   51845: Fixed ALF-19128: Artifact alfresco-repository-*-config.jar contains test files and configuration
    - Move test files into test-resources
   51853: ALF-9096 - CLOUD-1825: Fixed issue with ordering of TransactionSynchronizationAdapter when Activiti job fails
   51859: Merged PATCHES/V4.1.4 to HEAD-QA (REMERGE)
      47738: ALF-18301 (now MNT-6342): ... NPE ... when debug logging for '...AbstractAsynchronouslyRefreshedCache' 
      Merge note: The fix was not present even though it went to HEAD on 8 March (rev 47807)
   51889: Upgrade Spring Surf to 1.2.0-M7 (r1274)
   51893: Removed old Activiti libraries that were conflicting with new ones and causing compilation failure.
   51895: Merge HEAD-BUG-FIX to HEAD-QA (4.2)
      50984: BDE-103: Switch joda-time dependency to core
   51896: Upgrade activiti to 5.11-alf-20130627 in POM for Cloud

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@51909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-07-01 09:35:59 +00:00
Steven Glover
e23383e064 Fix public api tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@49008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-04-09 15:38:37 +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
8f365b6a74 Merged BRANCHES/DEV/CONV_HEAD to HEAD:
48194: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47179: (RECORD ONLY) Rename Spring Surf libs back to 1.2.0-SNAPSHOT (reverting commit 47176)
        47182: (RECORD ONLY) Fix misnamed Surf lib
   48195: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes - alreasdy on HEAD and superceded later)
        47210: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             36760: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  36758: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36735: THOR-1430: QuickShare link breaks after uploading a new version of a shared file
             36768: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  36766: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36712: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
                            36692: Fix ALF-12966 - Comments doesn't work on iOS Safari. Anywhere TinyMCE is present does not work correctly e.g. comments, blogs, wiki, HTML content creation.
   48197: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47214: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             36791: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  36790: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36776: Merged HEAD to THOR1_SPRINTS
                            36771: Fixed ALF-14239 "Share rules config misread by rules rule conditions ("When")"
             36862: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  36860: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36857: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                            36187: Merged DEV to V3.4-BUG-FIX
                                 36121: ALF-234: There is no field restriction at the New Rule form in Share
                                    'maxlength="1024"' parameter has been added to title and description fields in 'rule-edit.get.html.ftl'
                       36858: Resolve THOR-1431: Create Rule: Fields Name and Description can contain more than 1024 and can contain wildcards
             36939: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  36656: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36655: THOR-1427: failures while uploading documents
                  36927: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36925: Resolve THOR-1433: Updated rule works just after upload (no update needed)
                  36933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36932: Resolve THOR-1442: Check in rule prevents working copy editing
                  36934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36882: THOR-1424: WebDAV via HTML/browser view: "Up a level" link does not work if at the network level 
                  36936: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36935: Resolve THOR-1445: Preview generation for pdf and office files with size larger than ~1.2Mb fails
                  36938: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36701: Merged from V4.0-BUG-FIX to THOR1_SPRINTS
                            36698 Fixed bug where WebPreviewer sometimes isn't aligned with the rest of the document details page
                       36789: Resolve THOR-1438: Incorrect list of mimetypes in the rules
             37003: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  37002: Resolve THOR-1436: Remove Beta Logo / Label
   48199: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47274: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             37681: Fix build issue - merge error
        47275: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             38401: Fix activities feed mail notifications.
        47276: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             38726: Resolve CLOUD-160: "Data too long for column 'report' at row 1" when deploying Cloud1-144 to Test
                 patches run against tenants no longer concatenate the patch report from each tenant
             38754: Fix test
   48200: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47303: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             39830: Resolve CLOUD-423: Concurrent registration / account activations are not handled gracefully
   48203: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47358: Fix merge/test error (PatchTest.testSimplePatchSuccess)
   48244: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47172: Merged DEV/CLOUD2 to DEV/CONV_V413
           36067: Fix merge issue
           36068: Fix document actions page when no repository view
           36084: Fix date rendering merge issues
           36086: Fix client resources merge issue
   48245: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47225: Merged DEV/CLOUD2 to DEV/CONV_V413
           36117: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              35994: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   34517: Prevent 304 revalidations for unchanged thumbnails in document library, web preview and search
                   34607: Ensure folders created containing "#" don't send document library into infinite loop.
                   34615: Performance improvement: prevent unecessary 304 revalidation for user avatar thumbnails in header WebScript
                   34638: Performance improvement: prevent unnecessary 304 revalidation for avatars in activity feeds
                   34639: Performance improvement: prevent unnecessary 304 revalidation for avatars on following/follwers pages
                   34658: Performance improvement: prevent unnecessary 304 revalidation for avatars on site colleagues dashlet
                   34661: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
                        34636: Fix for ALF-13365 SOLR: Recently modified docs dashlet sorts incorrectly
                               - respect short property names on sort requests @cm:created and not require the full @{uri...}created
                   34662: Refactored revalidation code to remove previously added WebScripts that are now surplus to requirements
                   34668: Fix build break
                   34680: Fixed bean config problem (caused by r34662)
                   34684: Performance improvement: prevent unnecessary 304 revalidation requests for thumbnails in detailed view of My-Documents and Recently Modified Documents dashlets
                   34701: Further refactoring of 304 revalidation code to ensure backwards compatibility
                   34723: Fix build break
              36003: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   34895: Resolve THOR-1251: Text for Site URL field on Create Site Form Wrong
                   34897: Resolve THOR-1250: Text on Accept Invite Page Wrong
                   35036: Changed Upload REST API to no longer immediately request thumbnail for an uploaded document. Performance improvement as requested. (re ALF-1015)
                   35142: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS:
                        35013: ALF-13561: Not found error after uploading new version (THOR-1304)
                   35320: Fix to issue where 'Avatar' alt text was shown rather than user avatar in the Site Members (colleagues) dashlet.
                   35546: Improve upload.post.js to use the "filename" argument if it is passed to set the name of the file on upload.
              36019: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36020: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36021: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36022: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36023: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36024: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36025: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   34819: THOR-1255 - Define a GhostScript powered transformer for generating PNGs from PDF files, then override the regular PDF to Image transformer definitions from content-services-context.xml with ones that call GhostScript instead of the com.sun in-JVM one
              36026: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36027: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36028: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36029: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36030: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   34921: THOR-1176: GoSquared analytics script
                   34922: THOR-1176: Removed accidentally committed file
                   34923: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS
                        34914: Merged DEV to V4.0 
                           34889: ALF-12678: Errors in log on startup (ts.alfresco.com 4.0)
                                  BasicHttpAuthenticatorFactory.BasicHttpAuthenticator.authenticate(RequiredAuthentication, boolean) handles AuthenticationExceptions from authenticateAsGuest() calls. The result is a 401 Unauthorized response.
                        34920: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
                                 34892: Fix for ALF-12930
                                 34917: Fix for ALF-12930 - pushed down to 3.4.X
                               Also related tweak for ALF-10823 to EditionInterceptor now that the repository returns 401 for guest auth unsupported.
              36032: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36033: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36034: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   35071: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                        31745: ALF-11268 adding logging.properties and suppressing activiti-logging (which is not log4j but plain JUL)
                        32336: ALF-11607: "DB2/LINUXX8664" now recognized as DB2 database-type in activiti
                        32944: ALF-12066 issue with the db2 create-script for activiti
                        (note: pre-reqs for cleaner merge of r34747)
              36035: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   35072: THOR-1245: initial fix for doclib test case
              36036: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36037: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36038: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   35211: THOR-1182 "MOBREG-07: A page exists confirming the users registration and invites them to enter the password they registered with"
                   35294: THOR-1309 - F405: Account Types aligned to sales and marketing requirements
                   35311: Merged BRANCHES/DEV/THOR1_MOBREG to BRANCHES/DEV/THOR1_SPRINTS:
                        34958: Fix for THOR-1185 and change password hashing to use SHA-2
                        35026: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded"
                             - hook into documentLibrary node creation to do the sample acp import
                        35302: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded"
                             - use SHA for password hashing
                             - ensure that sample content is added only to home sites
                        35309: THOR-1185 "MOBREG-16: New sample ACP for users home site is loaded"
                            - minor update to sample content acp
                        35310: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded"
                             - removed un-needed properties from repository.properties
                   35326: Merged BRANCHES/DEV/THOR1_MOBREG to BRANCHES/DEV/THOR1_SPRINTS:
                        35324: Fix build
                   35327: Fix build
                   35337: THOR-1309 - F405: Account Types aligned to sales and marketing requirements
                   35533: THOR-1309: F405: Account Types aligned to sales and marketing requirements:
                   35672: THOR-1313 - F410: List accounts filtered by account type
                   35673: Minor: Update account type ids (as used by tests) to be consistent with the latest config (as per THOR-1309)
                   35695: THOR-1313 - F410: List accounts filtered by account type
                   35704: Fix Get Account Types REST API (to also include network admin quota) - related to THOR-1309 / THOR-335
                   35770: Minor: add additional logging only (THOR-1323)
        
   48247: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47263: Merged DEV/CLOUD2 to DEV/CONV_V413
           36119: 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
           36617: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36564: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                    35780: THOR-1312 - F409: List accounts optionally sorted by (numeric) account type id (ascending or descending)
                    35807: THOR-1335 - support bulk email address domain validation
                    35903: THOR-1312 / THOR-1313 -List accounts optionally filtered or sorted
                    35904: THOR-1310 / THOR-1311 - List accounts optionally sorted by total user account or total file size (or account type, as previously)
              35945: Merged BRANCHES/DEV/mward/thor_transforms to BRANCHES/DEV/THOR1_SPRINTS:
                    35819: Added transformation server changes.
                    35820: Fixed compilation error, though a size of -1 for getActiveTransformers(...) is not likely to be valid.
                    35823: Transformations: changed default transformation server URL to be blank.
                    35897: Remote transformations server: fixed webscript bean id so that it responds to requests correctly.
                    35898: Remote transformations server: fixed JSON generation/parsing.
                    35910: Remote transforms server: fixed broken RemoteAlfrescoTransformerTest
                    35920: Remote transformation server: fixed broken test.
                    35937: Remote transformation server: integrated HTTPS support via HttpClientFactory.
                    35939: Remote transformations: added a boolean client-enabling property.
                    35941: Remote transformations: changed ProxyContentTransformer to delegate isExplicit() calls to worker.
              36011: Merged BRANCHES/DEV/THOR1_QUICK_SHARE to BRANCHES/DEV/THOR1_SPRINTS:
                    34685: Creating Quick Share branch
                    34826: First cut of THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                    34868: More on THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                    34901: QuickShare REST API - WIP ... note: API will change :-)
                    34933: QuickShare REST API - WIP 
                    34934: QuickShare REST API - WIP 
                    34941: QuickShare REST API - WIP ... note: API will change :-)
                    34989: QuickShare REST API - WIP 
                    34995: QuickShare REST API - WIP
                    34996: QuickShare REST API - WIP
                    35011: QuickShare/PublicView REST API
                    35025: F387: As the link receiver, I can view the Document Preview in the browser without having to login
                    35035: QuickShare/PublicView REST API
                    35052: QuickShare/PublicView REST API
                    35069: More on THOR-1270 "F387 As the link receiver, I can view the Document Preview in the browser without having to login"
                    35094: Removed cpnfig property that was commited by mistake
                    35111: First cut of THOR-1268 "F378: As a user I can choose to share a document"
                    35252: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit
                    35254: First cut of THOR-1268 "F378: As a user I can choose to share a document" part 2
                    35255: THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                    35264: QuickShare/PublicView REST API
                    35317: THOR-1322: New metadata doesn't return "webpreview" in thumbnails (part 1)
                    35319: QuickShare REST API - fix tenant ref when share'ing
                    35330: QuickShare REST API - fix THOR-1322: New metadata doesn't return "webpreview" in thumbnails (part 2)
                    35368: QuickShare REST API - THOR-1336: (F418) Get context (nodeRef, siteId, tenantDomain) for a shared_id
                    35376: QuickShare REST API - fix THOR-1273 (unshare document)
                    35424: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit
                    35425: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit
                    35566: Fixed THOR-1268 "F378: As a user I can choose to share a document"
                    35617: THOR-1350: Update Slingshot API (doclib2) - make the "qshare:sharedBy" return full details (instead of just userName)
                    35624: THOR-1339: QuickShare REST API
                    35682: Fixed THOR-1268, THOR-1339 & THOR-1269   
                    35935: QuickShare REST API - add "system.quickshare.enabled" prop (if set to false then disables QuickShare service/API)
                    35996: Fixed THOR-1369 & THOR-1270  
                    35997: Fixed THOR-1369 & THOR-1270 part 2  
                    36000: Fixed THOR-1369 & THOR-1270 part 3   
              36082: THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                    - Re-added "Document Details" link public share page
              36128: Merged THOR1_SITE_INVITE_THOR-809 to THOR1_SPRINTS
                    THOR-809 "Site Invites Usability - Finish as per original design"
                    - First cut of: #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated.
                    THOR-809 "Site Invites Usability - Finish as per original design"
                    - Second cut of #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated.
                       * Tooltip is now a common one for all emails rather than individual since that caused issues when being scrolled inside div element. This approach is also less intrusive
                    THOR-809 "Site Invites Usability - Finish as per original design"
                    - Third cut of #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated.
                       * Scroll bar is only visible when needed
                       * Now works in IE7
              36153: THOR-694: File size upload limit is not adhered to by Alfresco repository
              36186: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS:
                    32842: ALF-11947: Contributor/consumer can't like/unlike or comment document/folder if versionable aspect applied
                    32850: ALF-11947: Contributor/consumer can't like/unlike or comment document/folder if versionable aspect applied
                    (THOR-1208, THOR-1210)
              36188: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                    34193: ALF-12205 - Contributor can't comment document/folder if versinable aspect is applied
                    (THOR-1209, THOR-1302, THOR-1387)
              36237: THOR-28: Account Service - Get Account Method API
              36252: THOR-28: Account Service - Get Account Method API
           36624: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36565: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                    36289: THOR-1314: Changed e-mail action in upgrade button to link
                    36290: MT fix for SiteService
                    36291: THOR-538 / THOR-1168 - auto remove external user from a secondary network when they no longer belong to any sites ...
                    36292: THOR-900: Modified URL rewrite filters to enforce encoding of "@" symbols sin URL so that the invalid session timeout error doesn't occur
           36631: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36570: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                    36308: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                          36109: ALF-7874 MimeType definitions for Adobe AfterEffects files
                          36110: ALF-7874 Upgrade Tika for improved detection of Adobe Premier and AfterEffects
                          36112: ALF-7874 MimeType definition addition for Adobe Premier files
                    36313: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                          33730: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX:
                             33726: ALF-7264 Upgrade Commons Validator to 1.4.0 Final, fixing VALIDATOR-292. Then, update the EmailValidator flags to allow local addresses during validation, so that Alfresco can send emails to @localhost addresses without error
                          33779: Upgrade Tika for ALF-12714
                          33782: ALF-12714 Add 3GPP/3GPP2 video, and MP4 Audio mimetypes
                          33783: Update Tika for more MP4/QuickTime support, and enable MP4 audio metadata extraction + "quick" testing
                          34884: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX:
                             34883: Tika and POI upgrade for ALF-13106
                    36340: AttributeService improvement: update puc value + cache (based on keys rather than id)
                    36341: Tenant usage quotas improvement
                    36412: THOR-1403: added connection timeout property to HttpClientFactory.
                    36413: THOR-1403: added 3s connection timeout to transformer client configuration.
                    36425: Tenant usage quotas improvement
                    36428: Merged THOR1_SITE_INVITE_THOR-809 to THOR1_SPRINTS
                          THOR-809 "Site Invites Usability - Finish as per original design"
                             - Added semicolon as email separator
                             - Fixed seecltion bug for SF, text now selected on first click and deselected on 2nd click (tested IE, SF & Chrome)
                    36431: Resolve THOR-1406: Emails with apostrophes aren't accepted
                    36455: Resolve THOR-1146: qamy.alfresco.com: incorrect URL for the RSS items
                    36456: Resolve THOR-1061 Incorrect text for the 'Task History' link
                    36457: Resolve THOR-1345: Missing apostrophe on mobile / cloud sign-up web page
                    36459: Merged BRANCHES/DEV/mward/thor_transforms to BRANCHES/DEV/THOR1_SPRINTS:
                          36458: THOR-1411: New Alfresco remote transformation subsystem is DEBUG logging by default
                    36460: Resolve THOR-1294: Terms and Conditions Link in Sign up screen does not work
                    36464: Resolve THOR-1238: Missing message string: error.header.wrong-reset-user
                    36472: Merged DEV/THOR1_QUICK_SHARE to DEV/THOR1_SPRINTS
                          Improvements for THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                          - Added new component evaluator for bringing in different components based on page id
                          - The title of the quickshare page now contains the document's name (to improve the social "Share with:" experience)
                          - Added new icon for page not found screen
                    36477: AttributeService improvement: fix test/build (PropertyValueDAOTest.testPropertyUniqueContextValue)
                    36482: Resolve THOR-1416: Remove Polymorph Client
                    36484: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                          36259: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
                             << Developed on Windows 7. Might need more work on Linux to get LibreOffice to shut down, but should be
                                okay with OpenOffice 3.2 which was used in the previous release. >> 
                             - Updated jodconverter to latest version jodconverter-core-3.0-SNAPSHOT-patched.jar 28/4/2012 which is newer
                                than 3.0 beta-4
                             - Applied patch for http://code.google.com/p/jodconverter/issues/detail?id=103 to handle setting the env
                                for LibreOffice 3.5
                             - Modified code to use partial GNU style options (not used for -env!) when using LibreOffice
                             - Added OpenOfficeCommandLine to dynamically supply OpenOffice or LibreOffice command line args for OOoDirect
                             - Tested to work with OpenOffice 3.4 and 3.2 on Windows 7
                          36264: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
                             - remove old jodconverter-core-3.0-beta-3.diff
                          36273: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
                             - Return a dummy OpenOffice command even when there is no OpenOffice/LibreOffice installed or on the path.
                    36485: Resolve THOR-1418: Switch off S3 encryption by default
                    36508: THOR-1200 (CORE CHANGE): Modification to forms-runtime to prevent field undefined errors
                    36509: THOR-1200 (MODULE CHANGE): Re-introduce folder rules
                    36517: THOR-1353: Ensure IE8 users can create tasks
                    36521: Resolve THOR-1348: Account Settings screen should display Account Type
                    36530: Fix solrcore.properties
                    36540: THOR-1200: Force folder rules to run asynchronously
           36634: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36633: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                    36601: Merge from THOR1_QUICK_SHARE to THOR1_SPRINTS
                          36599: Improvements for THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                             - Made the "Preparing previewer... text get rendered using javascript so Google+ won't
                             include it in its description when sharing quickshare links
           36673: Fix issue where thumbnail failed to render when lastModified list provided but not for thumbnail type requested
           36760: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36758: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                    36735: THOR-1430: QuickShare link breaks after uploading a new version of a shared file
        
        
   48248: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47266: Merged DEV/CLOUD2 to DEV/CONV_V413
           37343: Fixed renamed directive issue in resources.get.html.ftl and updated spring-surf-api lib to ensure checksum appended MessagesWebScript URLs are matched
           37402: THOR-1479: Alfresco.DocumentList.generateThumbnailUrl Ignores renditionName Parameter
              - Changed call to Alfresco.util.generateThumbnailUrl to use renditionName parameter instead of hard-coded "doclib"
              - Added check for null renditionName parameter, if true use default of "doclib"
           37413: Fix issue from "V4.0-BUG-FIX to CLOUD1 merge" r37178 part 4
              - Missing </script> tag in colleagues dashlet
           37414: Added login box shadow for IE8
           37415: Minor Share fixes from Sprint 
              - THOR-383 "When multiple invitations are sent to a single user, the pending invitations UI is not laid out right."
              - THOR-431 ""Site Dashboard" not highlighted in banner when that page is displayed"
           37454: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              37453: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   37451: Resolve THOR-1477: Video not previewing correctly
   48249: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47273: Merged DEV/CLOUD2 to DEV/CONV_V413
           37652: THOR-1489: Alfresco.util.generateThumbnailUrl Ignores thumbnailName During Last Modified Check
              - Changed hard-coded "doclib" to thumbnailName
   48250: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47280: Merged DEV/CLOUD2 to DEV/CONV_V413
           39206: Fixed CLOUD-198 "WASA - XSS issue with quickshare"
   48254: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47282: Merged DEV/CLOUD2 to DEV/CONV_V413
           37516: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              37509: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   37167: Merged HEAD to BRANCHES/DEV/THOR1_SPRINTS:
                        37157: THOR-1459: WebDAV: site names cannot start with 'webdav'
                   37302: THOR-1403: ensure indexing happens asynchronously on upload.
                   37303: THOR-1403: removed thumbnail creation during file upload.
                   37459: THOR-1429: Webdav returns 500 when you don't have access to moderated site 
                   37469: THOR-1475: Fixed avatar thumbnails for users joining/leaving/role change on sites.
                   37506: Resolve THOR-1481: Cannot preview PDFs over 3.5MB in size
        
   48256: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 
        47283: Merged DEV/CLOUD2 to DEV/CONV_V413
           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.
           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
   48259: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 
        47302: Merged DEV/CLOUD2 to DEV/CONV_V413
           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
        Merged PATCHES/V3.4.6 to CLOUD1   
              39491: ALF-13404: Another attempt. Still not performing. Giving up on the cm:* idea altogether.
        Merged V3.4-BUG-FIX to CLOUD1
              39672: Merged PATCHES/V3.4.6 to BRANCHES/DEV/V3.4-BUG-FIX
                 39534: ALF-13404: Now we understand it! Content I'm Editing dashlet is non-site specific so should use cm:* in its queries. However, site filters and dashlets should NOT.
           Merged V4.0-BUG-FIX to CLOUD1      
              36635: ALF-13404 for documentlibrary-v2 APIs
              37121: ALF-12796: Ensure that only visible nodes are shown via Category search in Repository view when libraryRoot is changed from company home.
           Merged PATCHES/V3.4.6 to CLOUD1
              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
           Merged V4.0-BUG-FIX to CLOUD1      
              37443: Hand merge of second round of PATH query improvements for ALF-13404 to doclib2 API scripts
           Merged V4.1-BUG-FIX to CLOUD1
              38209: Tweaks to code merged over recently from 3.4 relating to doclib filters query simplification.
           38298: Fix for ALF-13737 - Error when 'favoriting' Company Home
              39678: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX
              39672: Merged PATCHES/V3.4.6 to BRANCHES/DEV/V3.4-BUG-FIX
                    39534: ALF-13404: Now we understand it! Content I'm Editing dashlet is non-site specific so should use cm:* in its queries. However, site filters and dashlets should NOT.
           Hand merged above changes to documentlibrary-v2 filter scripts.
        
        
        
   48260: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 
        47305: Merged DEV/CLOUD2 to DEV/CONV_V413
           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.
           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).
   48262: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47374: Merged DEV/CLOUD2 to DEV/CONV_V413
           40553: Remove on-premise style MT store Id extraction code from syncmode config lookup.
   48263: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47375: Merged DEV/CLOUD2 to DEV/CONV_V413
           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
        
   48266: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI 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
        
   48267: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47411: Merged DEV/CLOUD2 to DEV/CONV_V413
           42121: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
              39663: CLOUD-153 - Invite box doesn't parse email addresses properly
   48269: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47422: Merged DEV/CLOUD2 to DEV/CONV_V413
           42047: Merged DEV/CLOUD_SIGN_UP into DEV/CLOUD1 (cloud priority 
        47430: Merged DEV/CLOUD2 to DEV/CONV_V413
           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
   48270: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY)
        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: CLLOUD-42 - Image previews should be larger
   48271: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47345: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             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
        47357: Fix merge/compile error (solr /cmis query)
        47370: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41149: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41146: Fix trusted authentication against OpenCMIS
        47372: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41192: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
   48272: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes)
        47368: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41128: (RECORD ONLY) 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
   48274: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47356: (RECORD ONLY) Add temp logging - to investigate unit test failures on build only
   48277: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47376: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41302: CLOUD-622: "Mobile App connection to testmy build 227 issue"
             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:
             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
             41560: CLOUD-657: "cmis root service document returning incorrect urls"
             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
             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"
        47378: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             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
             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"
   48289: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47447: Merged DEV/CLOUD2 to DEV/CONV_V413
           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
        
   48291: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY)
        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
   48293: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY)
        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).
   48304: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        48301: CONV: Revert temp logging (added in r47356)
        48303: CONV: Fix CLOUD-1449 - cannot login to Share as MT (admin) user
   48306: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47379: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (note: web.xml reverted - initially will be covered by cloud overlay until public api is "merged")
             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
   48307: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47382: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41842: CLOUD-619: "CMIS query for objectId throws exception"
        47400: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             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
   48310: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47406: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             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
        47408: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             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
   48311: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47416: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             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
             42320: Fix build (fix dodgy merge)
   48313: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47492: Fix build/tests - CMISTest.testCancelCheckout & OpenCmisLocalTest.testALF10085 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-03-19 14:16:01 +00:00
Kevin Roast
0dbc461fad Improvement to fix and encapsulate the test for user writes to preferences. Also switched around the test so the fastest and most likely to succeed tests go first.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-09-21 09:42:16 +00:00
Dave Ward
ee8081b663 Merged V4.1-BUG-FIX to HEAD
41035: Fix for ALF-15225 - qt.length not performing as expected in search.lib.js
   41047: RUSSIAN: Translation updates based on EN r40961
   41049: GERMAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41050: SPANISH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41051: FRENCH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41052: ITALIAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41053: JAPANESE: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41054: DUTCH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41055: RUSSIAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41061: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console
   41063: RUSSIAN: Translation updates based on EN r41033 (encoding fixes)
   41064: CHINESE: Translation updates based on EN r41033
   41073: ALF-15760: Merged V4.0 to V4.1-BUG-FIX (another lost meta-inf revision)
      34416: ALF-12992: Updated weblogic DD for SOLR
   41074: ALF-15419 / ALF-14438: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (PARTIAL)
      37373: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         36821: ALF-13827 / ALF-14402: Make replicated caches recover from temporary comms failures by flushing when a change in peers is detected
         - We do not flush caches who replicate via copy (e.g. tickets cache) as these may not be recoverable
         37122: ALF-13919 / ALF-14403: Merged DEV to PATCHES/V3.4.6
         - Rework of Dmitry's implementation
         - Uses dynamic HQL query to retrieve JBPM workflow instances by specified query criteria
         - WorkflowInstancesGet web script no longer has to iterate over every workflow instance in the database!
         - DB index added to enable efficient querying by string variable
         - Hibernate tastic!
         37188: ALF-13919 / ALF-14403: Worked around HQL polymorphism issues by using explicit variable subclass names in from clause
         37204: ALF-13919 / ALF-14403: Fix to date range handling by Dmitry
   41077: ALF-10730: Fixed object finder drop-down tree to show parent icon type when icon type not available
   41089: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
   41109: Part fix for ALF-11297 Disabled test: test-system-build-test has been removed from the test target dependency list
   41118: Fixes: ALF-15765 and related issue ALF-15476: 
      - Corrects merge of r34405 and r40159
      - Adds people api to cloud proxy config
      - Cloud/Global Folder picker sites list now universally shows only those sites the user is a member of.
   41119: ALF-15419 / ALF-14438: Merged DEV to V4.1-BUG-FIX
      41117: ALF-15419 : CLONE Remove JBPM indexes present from upgrades
         The schema reference files were updated to contain JBPM_VARIABLEINSTANCE.IDX_VARINST_STRVAL index.
   41130: ALF-15590: FSTR transfer of custom content type with parent cm:content fails
   - Fix by Dmitry
   41131: ALF-15714: Bitrock Uninstaller: Uninstaller doesn't remove all files and folders in *nix
   - Fix provided by Bitrock
   41132: Fix for ALF-14388 - Edit Online option is not supported for '.docm', 'dotm', '.xlsm' files
    - corrected mimetypes to be lower-case
   41150: ALF-13287 Added the handling of UTC represented by "Z" within comparator
   41154: Check for authentication errors when validating a ticket, if an error occurs re-authenticate. ALF-15394
   41155: ALF-15569: User with '@' symbol in username cannot invite
   - note: since Ent 4.0.2(+) by default MT is pre-configured but not enabled
   41173: Merged V4.1 to V4.1-BUG-FIX
      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
   41176: Attempt to debug unit test failure
   41181: Store leak in AVMServiceTest.test_ETWOTWO_570() causing unit test failure
   41184: ALF-15610: Copy Thai analyzer settings to its many SOLR locations
   41194: ALF-11297: re-enable system build tests
   41195: ALF-11297 ALF-15807: update activities system build tests after correction of ALF-4832
   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
   - check it makes any difference
   41204: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_08_15 to BRANCHES/DEV/V4.1-BUG-FIX: (note: merging as-is ... refactor + unit test fix to follow in next commit)
      40926: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
      40974: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
   41205: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
   - review and refactor the proposed/merged fix (see previous commit)
   - fix unit test so that it accounts for previous content (as per the original issue)
   - also: add missing test to suite and fix that test to work with the new fix (ie. cleanup previous content, else need to account for it)
   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
   - do not expand authorities for thoses with the ADMINISTRATOR_ROLE as they can read all anyway
   41216: ALF-11297: system build tests need a database cleanup before running
   41222: ALF-15740, ALF-14744: Update rule firing broken for content created in Explorer
   - Old code lurking around that used to use the inline editable aspect to detect events handled by the CreateNodeRuleTrigger was removed from OnContentUpdateRuleTrigger and replaced with a check for ASPECT_NO_CONTENT
   41223: Added missing swf.languagedir setting to enterprise alfresco-global.properties
   41230: GERMAN: Translation updates based on EN rev41099.
   41232: SPANISH: Translation updates based on EN rev41099.
   41233: FRENCH: Translation updates based on EN rev41099.
   41234: ITALIAN: Translation updates based on EN rev41099.
   41235: JAPANESE: Translation updates based on EN rev41099.
   41236: DUTCH: Translation updates based on EN rev41099.
   41237: RUSSIAN: Translation updates based on EN rev41099.
   41239: CHINESE: Translation updates based on EN rev41099.
   41254: ALF-15628: Avoid edit online (SPP, WRITE_LOCK) clashing with edit offline (CheckOutCheckInService, READ_ONLY_LOCK)
   - Rationalization of work by Alex Malinovsky
   - WebDAVMethod.checkNode() now properly checks whether nodes without WebDAV lock info are writeable
   - CheckOutCheckInService won't allow checkout of a node with an existing WRITE_LOCK by the same user - they must unlock first
   - Propagation of correct status codes
   41264: ALF-15628: Fix CheckOutCheckInService test failures
   41265: ALF-15699: Reverse merged the following, thus downgrading us back to swftools 0.9.1
      40208: ALF-12831: Upgrade to swftools 0.9.2
   41266: Rush'n in some translation updates from Gloria
   41267: ALF-15628: Fix compilation problem
   41269: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      41224: ALF-14856: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
      41268: ALF-15459: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX
         Merged V4.1-BUG-FIX to V3.4-BUG-FIX
   41274: ALF-15608: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      41272: ALF-15567: Allow links to be followed through WebDAV on port 80 using basic auth on XP
   41277: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually) 
   - fix test fallout after merge/fix (note: failed for PostgreSQL but not MySQL - although fix was not DB-specific)
   41278: ALF-15840 Error logged when "No thumbnail present in file" even though this is normal 
   41284: ALF-14875: Serialize direct permissions after inherited permissions so that they take precedence in any lookups in permission dialogs
   41290: JAPANESE: Translation updates based on EN r41099 Fixes: ALF-14565
   41296: ALF-15251	CIFS: Checked out document is not marked as locked in CIFS
   41299: ALF-15714: Bitrock Uninstaller: Uninstaller doesn't remove all files and folders in *nix
   - Additional fix provided by Bitrock
   41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
   - do not skip IO Exceptions
   41306: Incremented version revision for 4.1.2
   41309: ALF-15827: Added FORMACTION, FORMMETHOD and ACTION  HTML attributes to grey list to close security hole (updated Surf libs r1136)
   41318: ALF-15857: Lucene FTS indexer opens streams to all documents to be indexed in a transaction simultaneously
   - Now stream opening is delayed until the point where the document is being written to the index
   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
   41326: ALF-15234: IE 8 or IE9 Download .pps as .ppt 
      -Switched the order of the filename headers to better support non-conforming browsers (rfc 5987).
   41330: ALF-14875: Reversed r41284 because it didn't solve the problem in the UI. Kev reviewing.
   41332: ALF-10688: Can't deactivate an account when alfrescoNtlm follows another authentication subsystem in the authentication chain
   - Now, if a account is known to be 'mutable' then the enabled flag is read from the mutable authentication service
   41337: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.2)
      41336: TransformerDebug: Use debug rather than trace when there are transformers but they are all unavailable.
   41339: ALF-15840 Error logged when "No thumbnail present in file" even though this is normal
      - Found some more cases where this is logged as an ERROR
   41342: ALF-11087 (Missing icon file: components\images\filetypes\generic-tag-32.png)
   41344: ALF-15863 (* search values): Merged HEAD to V4.1-BUG-FIX (4.1.2)
      40849: ALF-12839 "Share - Inconsistency in adding a user or a group into a group" part 2
      - Making the users console stop "*" searches, just like the groups console when the min search length is set to larger than 0.
   41346: ALF-15237 - REST API Group children lists username for fullName and displayName
   41350: Merge V3.4-BUG-FIX to V4.1-BUG-FIX:
   41065: Disconnect existing CIFS sessions from the same client when a virtual circuit zero session is opened. ALF-13815
   41280: Moved session cleanup config into the base authenticator, added support to passthru/base authentication. ALF-13815
   41351: Ported database filesystem changes to fix session disconnect, from V3.4.
   41352: Merge V3.4-BUG-FIX to V4.1-BUG-FIX:
   41067: Added session disconnect support to the Alfresco CIFS authenticator. ALF-13815.
   41281: Added session cleanup support to passthru authenticator, session cleanup config moved to base class. ALF-13815 
   41353: Update svn:mergeinfo
   41355: Fix for ALF-15869 - "Site Content" dashlet shows all documents from all the sites in Alfresco Share
    - mistakenly did a record-only merge of this from 4.1->4.1.1
   41363: Fix for ALF-14875 - Manage permissions shows the permission 'No privileges' for All Other Users
    - reworked the permissions dialog and permissions panels to correctly handle multiple permissions on a special permissions group such as GROUP_EVERYONE
    - now correctly gets/sets permissions for GROUP_EVERYONE
    - this also fixes ALF-12014 - in that it allows custom SiteXYZ permissions to work correctly again also (will need manual backport for 3.4.X though)
    - removed hacks related to previous attempts to fix the above issue
    - added lots of comments around relevant sections to add in future refactoring or understanding
   41371: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX (RECORD ONLY)
      41370: Fix for ALF-12014 - Share - Custom role causes incorrect display of permissions
   Manual merge of changes to 4.1.2
   41399: ALF-13438: java.lang.OutOfMemoryError appears in alfresco log when trying to create few thousands of sites consistently. 
   - The v4.0 parent assocs cache used to store every verion of every node's parent assocs, so as we added a node to 60,000 sites, we retained all previous versions of the user's parent association map
   - After creating 10,000 sites, the cache size was about 4GB, containing about 2 million parents
   - Now we use a specialized class that allows an upper limit to be set on the total number of cached parents as well as children.
   - Because the cache is keyed by node transaction ID, the cache can be non-clustered and non-transactional
   - Once the average number of parents is more than 8, the cache will drop its oldest entries
   - ParentAssocsInfo also now uses a compact TreeMap instead of a HashMap
   41401: ALF-13438: Small correction
   41406: ALF-13438: Fix failing unit tests
   - Removed unused node.parentAssocsSharedCache and corrected node.childByNameCache not to reference it!
   - Because parent assocs are cached by transaction ID, we must always invalidate them on an in-transaction version increment
   41409: Logging of unexepected errors on FTP
   41411: Fix possible FTP data session leak if client mixes PORT and PASV commands. ALF-15126
   41412: ALF-15845 : Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
   41415: Fixes: ALF-15649: Removes country locale from files with it hard coded.
   41419: ALF-14599: Removed ftp.ipv6.enabled from enterprise overlay and bundles
   41426: ALF-15845 Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
     Roll back changes to DiskDriver interface in favour of hacking NetworkFile.
   41440: JAPANESE: Translation update based on EN r41099
   41446: ALF-13091: Remove unecessary bean post processors from sub ssytem context and remove CXF's Jsr250BeanPostProcessor.
   41458: RUSSIAN: Further translation updates following linguistic review.
   41459: ALF-15897: Revert revision 41446, an attempted fix for ALF-13091
   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
   41506: Merged DEV to V4.1-BUG-FIX
      41505: ALF-15879: PostgreSQL: upgrade 2.2.8 (577) -> 3.4.10 (703) -> 4.1.1 (159) failed.
             - Make dropping "store_id" index and "alf_node_store_id_key" constraint optional in 4.1.1 upgrade script
               because clean 3.4 has "store_id" index and doesn't have "alf_node_store_id_key" constraint,
               but 3.4 upgraded from 2.2  has "alf_node_store_id_key" constraint and doesn't have "store_id" index.
   41531: Fixed ALF-15687, so that any user (except for Admin) won’t be able to retrieve any other user’s preferences via REST API. Also, updated the preferences controllers for the Post and Delete.
   41539: ALF-15899: Inbound email does not support multiple recipient folders
   - Fix by Dmitry Vaserin
   41540: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40794: Merged DEV to V3.4-BUG-FIX
         40793: ALF-13752 Saving Word (mac 2011) documents via CIFS into a folder with Versionable rules on Mac OS X Lion (Fix for 3.4)
            In ContentDiskDriver.renameFile() was added a check whether a node in the archive.
      40806: Fix for ALF-9787 - Hiding sites in Share with permissionsDefinitions.xml [creates a permissions error in the blog portion of the site]
      40922: Merged DEV to V3.4-BUG-FIX (reviewed by Frederik)
         40488: ALF-13357 : Empty outcome when a timer is invoked
            A check for transitionName was added to AlfrescoTimer to support custom transitions.
      40940: ALF-15696: Remove svnkit.jar - makes the build fail if the version of installed command line svn is 1.7. Using commandline binding for <svn> Ant task to be consistent with other parts of the build.
      41066: Various fixes to the database filesystem for session disconnect cleanup.
      41068: Updates to the Alfresco filesystem for session cleanup. ALF-13815
      41301: Merged PATCHES/V3.4.9 to V3.4-BUG-FIX
         40966: ALF-15846 / ALF-15709: OOM on cascading reindex
         - Avoid buffering of all the affected PATH documents in memory - used the set of 'visited' paths to delay generation to the final flush.
         41044: ALF-15847 / ALF-15748: Lucene indexer can make sub-optimal cascade reindex decisions during an LDAP sync.
         - When a user in 6 groups was removed from a massive group, the massive group was getting cascade reindexed rather than the user
         - Logic adjusted as follows:
            For nodes with 5 or less parents, we always cascade reindex the child node. For nodes with more than 5 parents, we cascade reindex the parent node if it has less children than the child has parents.
      41395: ALF-15715: Unable to edit properties whilst transformation in progress
         - Delayed all changes that would potentially lock the parent node row while the thumbnail is generating.
         - Reorganized RenditionContext to lazily instantiate its destination node.
         - Changed render destination to use temporary ContentWriter until render is complete.
      41396: ALF-15715: Fix for failing unit tests.
      41413: Fix for issue where user calendar remote api was generating invalid date searches for user dashlet calendar.
      41509: Merged DEV to V3.4-BUG-FIX
         41507: ALF-12833: Issues installing Alfresco on WebSphere when the server doesn't have internet access
            Context-param which Sets "http://apache.org/xml/features/nonvalidating/load-external-dtd" feature on the SAXParser to false if this parameter is false 
      41510: ALF-15171: After addition of a secondary parent association to a container, not all index paths were being regenerated due to a logic error
      41512: ALF-15919: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
         41091: ALF-15723:  Merged DEV to PATCHES/V3.4.10
            26579: Switch the transformer to use Tika


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-09-12 19:10:54 +00:00
Alan Davis
d257bbc9d0 Merged V3.4-BUG-FIX to HEAD
30744: ALF-9524: WCM: Defining a complex type with 'abstract' attribute to true does not allow other complex types to define elements with the same name 
      - Fix by Pavel
   30804: ALF-9524: Fix to NPE by Pavel
   30812: ALF-718: Rules Fire Emails before Transaction Commit/Rollback
   Added tests and moved email sending into a post commit callback.
   30820: Fix for ALF-10516 - 'My Sites' dashlet should indicate it is loading rather than say 'No sites'
   30824: Fixed ALF-10470: DeclaritiveRegistry is looping continuously and re-initializing
    - Only replicate removals for the cache.  The reset always does a remove first.
       <cache 
           name="org.alfresco.cache.webScriptsRegistryCache"
                                    ...
                                    replicateUpdates = false,
                                    ...
       </cache>
   30827: ALF-10513 60k Site Performance: Unable to delete user + request not acknowledged for 2 minutes
     Now about 3 to 4 seconds
   30828: Andy H recommended change to lucene indexer values
   30831: ALF-718: Fix for InvitationServiceImplTest
   Fixes behaviour broken by original fix for ALF-718: the send-after-commit does NOT work for the invitation service, so it was necessary
   to change the code to only send-after-commit in the context of a rule.  
   30843: Fixed ALF-7698 "Defects in tags picker in SHARE." according to feedback provided in ALF-9953 "Decide order where new items shall appear in the object finder."
   30844: ALF-9544 - Inbound email restricts file name to 86 characters or less.
     used QName.createQNameWithValidLocalName()  as suggested.
     added new EmailServiceImplTest
   30849: Fixed ALF-8776 "Rule details dialog handling of apostrophes"
   30862: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with improvements)
      30856: ALF-10288: Regression of ALF-1997: non domain users cannot bypass SSO in Share using /share/page?pt=login
         In SSOAuthenticationFilter.doFilter() method added check (PAGE_SERVLET_PATH.equals(req.getServletPath()) && LOGIN_PATH_INFORMATION.equals(req.getPathInfo()).
   30864: SMTP Server, To and From address format.
     - Out standards for from and to address were stuck in the 1980s!
   30867: ALF-10517 - 'My Content' slow
    - performance improvements by reworking Lucene queries used to retrieve recently modified and recently created content for a user
    - converted queries to fts-alfresco
    - improvements from 3.5sec per page render down to 1.1 secs
   30874: MERGE DEV to V3.4-BUG-FIX
         30851 : ALF-9558 - Unchecked Return Value
   30882: - ScriptGroup.isRootGroup() now stops if it finds a single parent rather than doing a size on all parent groups.
     Not sure the logic (not changed by me) is correct as it includes parents that are site groups.
   - SiteServiceImpl now only gets the specified number of sites. Sometimes it would have return more if AuthorityDAOImpl
     switched approach used to get containing authorities.
   - Overloaded getContainingAuthorities to take a size parameter, deprecated other and switched calling code
     Done for isRootGroup activity.
   30910: - Fix build error
   - Found a better way to use filter in AuthorityDAOImpl.getContainingAuthoritiesInZone
     so that we don't need to reset the filter, by using the +ve hits from first approach
     if we switch to second approach.
   30925: - ALF-10501 60k Site Performance: Searching for a group to add to a site with a value that matches a few sites takes 2 minutes
     ALF-10502 60k Site Performance: Admin Console | Groups: search with a value that matches a few sites takes 70 seconds
     ALF-10504 60k Site Performance: Admin Console | Groups | Browse Groups page appears corrupt as it never finishes loading
     - All the above were slow as a result of ScriptGroup.isRootGroup()
     - ScriptGroup.isRootGroup() and ScriptGroup.isAdminGroup() removed - Checked with KevinR that these are not needed any more.
     - Removed code added on 30 Sep 11 to support isRootGroup (the size parameter to AuthorityDAO.getContainingAuthorities)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-10-03 16:23:14 +00:00
Dave Ward
2e62d4fb29 Merged DEV/ALAN/SITE_PERF to HEAD
30342: Dev branch for Site performance issues (including rework of AuthorityService.getAuthorities() to use a 'lazy' set and DM indexing rework)
   ALF-9899 Huge share site migration, add group to site and user access site related performance issue.
   ALF-9208 Performance issue, during load tests /share/page/user/user-sites is showing to be the most expensive.
   ALF-9692 Performance: General performance of Alfresco degrades when there are 1000s of sites present
   - ancestor-preloading
   - hasAuthority
   - huge site test
   30370: - Save changed to do with adding childAuthorityCache to AuthorityDAOImpl
   - Increase aspectsTransactionalCache size as it blows up
   30387: Experimental solution to 'cascading reindex' performance problem
   - Now only Lucene container documents for a single subtree are reprocessed on addition / removal of a secondary child association
   - No need to delete and re-evaluate ALL the paths to all the nodes in the subtree - just the paths within the subtree
   - Lucene deltas now store the IDs of ANCESTORs to mask out as well as documents to reindex
   - Merge handles deletion of these efficiently
   - Node service cycle checks changed from getPaths to recursive cycleCheck method
   - Adding a group to 60,000 sites might not require all paths to all sites to be re-evaluated on every change!
   30389: Missed files from last checkin
   30390: Optimizations / fixes to Alan's test!
   30393: Bug fix - wasn't adding new documents into the index!
   30397: Fixed a problem with bulk loading trying to bulk load zero parent associations
   Also tweaked reindex calls
   30399: Correction - don't cascade below containers during path cascading
   30400: Another optimization - no need to trigger node bulk loading during path cascading - pass false for the preload flag
   30404: Further optimizations
   - On creation of a secondary child association, make a decision on whether it is cheaper to cascade reindex the parent or the child, based on the number of parent associations to the child
     - Assumes that if there are more than 5 parent associations, it's cheaper to cascade reindex the parent
     - Add a new authority to a zone (containing 60,000 authorities) - cascade reindex the authority, not the zone
     - Add a group (in 60,000 sites) to a site - cascade reindex the site, not the group
   - Caching of child associations already traversed during cascade reindexing
   - Site creation time much reduced!
   30407: Logic fix: Use 'delete only nodes' behaviour on DM index filtering and merging, now we are managing container deletions separately
   30408: Small correction related to last change.
   30409: Correction to deletion reindex behaviour (no need to regenerate masked out containers)
   - Site CRUD operations now all sub-second with 60,000 sites!
   30410: Stop the heartbeat from trying to load and count all site groups
   - Too expensive, as we might have 60,000 sites, each with 4 groups
   - Now just counts the groups in the default zone (the UI visible ones)
   30411: Increased lucene parameters to allow for 'path explosion'
   - 9 million lucene documents in my index after creating 60,000 Share sites (most of them probably paths) resulting in sluggish index write performance
   - Set lucene.indexer.mergerTargetIndexCount=8 (142 documents in smallest index)
   - Increased lucene.indexer.maxDocsForInMemoryMerge, lucene.indexer.maxDocsForInMemoryIndex
   30412: Test fixes
   30413: Revert 'parent association batch loading' changes (as it was a bad idea and is no longer necessary!)
   - Retain a few caching bug fixes however
   30416: Moved UserAuthoritySet (lazy load authority set) from PermissionServiceImpl to AuthorityServiceImpl
   30418: - Remove 'new' hasAuthority from authorityService so it is back to where we started.
   - SiteServiceHugeTest minor changes
   30421: Prevent creation of a duplicate root node on updating the root
   - Use the ANCESTOR field rather than ISCONTAINER to detect a node document, as the root node is both a container and a node!
   30447: Pulled new indexing behaviour into ADMLuceneIndexerImpl and restored old behaviour to AVMLuceneIndexerImpl to restore normal AVM behaviour
   30448: - Cache in PermissionServiceImpl cleared if an authority container has an association added or removed
     Supports the generateKey method which includes the username
     Supports changes in group structures
   - Moved logic to do with ROLE_GUEST from PermissionServiceImpl to AuthorityServiceImpl 
   30465: - Tidy up tests in SiteServiceTestHuge 
   30532: - Added getContainingAuthoritiesInZone to AuthorityService
     - Dave Changed PeopleService.getContainerGroups to only return groups in the DEFAULT zone
   - Fixed RM code to use getAuthoritiesForUser method with just the username again.
   30558: Build fixes
   - Fixed cycleCheck to throw a CyclicChildRelationshipException
   - More tidy up of AVM / ADM indexer split
   - Properly control when path generation is cascaded (not required on a full reindex or a tracker transaction)
   - Support indexing of a 'fake root' parent. Ouch my head hurts!
   30588: Build fixes
   - StringIndexOutOfBoundsException in NodeMonitor
   - Corrections to 'node only' delete behaviour
   - Use the PATH field to detect non-leaf nodes (it's the only stored field with which we can recognize the root)
   - Moved DOD5015Test.testVitalRecords() to the end - the only way I could work out how to get the full TestCase to run
   30600: More build fixes
   - Broadcast ALL node deletions to indexer (even those from cascade deletion of primary associations)
     - Allows indexer to wipe out all affected documents from the delta even if some have already been flushed under different parents by an intricate DOD unit test!
   - Pause FTS in DOD5015Test to prevent intermittent test failures (FTS can temporarily leave deleted documents in the index until it catches up)
   - More tidy up of ADMLuceneIndexerImpl
     - flushPending optimized and some unnecessary member variables removed
     - correction to cascade deletion behaviour (leave behind containers of unaffected secondary references)
     - unused MOVE action removed
     - further legacy logic moved into AVMLuceneIndexerImpl
   30620: More build fixes
   - Cope with a node morphing from a 'leaf' to a container during its lifetime
   - Container documents now created lazily in index as and when necessary
   - Blank out 'nth sibling' field of synthesized paths
   - ADMLuceneTest now passes!
   - TaggingServiceImplTest also passes - more special treatment for categories
   30627: Multi tenancy fixes
   30629: Possible build fix - retrying transaction in ReplicationServiceIntegrationTest.tearDown()
   30632: Build fix - lazy container generation after a move
   30636: Build fix: authority comparisons are case sensitive, even when that authority corresponds to a user (PermissionServiceTest.testPermissionCase())
   30638: Run SiteServiceTestHuge form a cmd line
      set SITE_CPATH=%TOMCAT_HOME%/lib/*;%TOMCAT_HOME%/endorsed/*;%TOMCAT_HOME%/webapps/alfresco/WEB-INF/lib/*;\
                     %TOMCAT_HOME%/webapps/alfresco/WEB-INF/classes;%TOMCAT_HOME%/shared/classes;
      java -Xmx2048m -XX:MaxPermSize=512M -classpath %SITE_CPATH% org.alfresco.repo.site.SiteServiceTestHuge ...
   
      Usage: -Daction=usersOnly
             -Dfrom=<fromSiteId> -Dto=<toSiteId>
             -Dfrom=<fromSiteId> -Dto=<toSiteId> -Daction=sites  -Drestart=<restartAtSiteId>
             -Dfrom=<fromSiteId> -Dto=<toSiteId> -Daction=groups -Drestart=<restartAtSiteId>
   30639: Minor changes to commented out command line code for SiteServiceTestHuge
   30643: Round of improvements to MySites dashlet relating to huge DB testing:
    - 10,000 site database, user is a member of ~2000 sites
    - Improvements to site.lib.ftl and related SiteService methods
    - To return MySites dashlet for the user, order of magnitude improvement from 7562ms to 618ms in the profiler (now ~350ms in the browser)
   30644: Fixed performance regression - too much opening and closing of the delta reader and writer
   30661: More reader opening / closing
   30668: Performance improvements to Site Finder and My Sites in user profile page.
    - faster to bring back lists and site memberships (used by the Site Finder)
    - related further improvements to APIs used by this and My Sites on dashboard
   30713: Configuration for MySites dashlet maximum list size
   30725: Merged V3.4-BUG-FIX to DEV/ALAN/SITE_PERF
      30708: ALF-10040: Added missing ReferenceCountingReadOnlyIndexReaderFactory wrapper to IndexInfo.getMainIndexReferenceCountingReadOnlyIndexReader() to make it consistent with IndexInfo.getMainIndexReferenceCountingReadOnlyIndexReader(String, Set<String>, boolean) and allow SingleFieldSelectors to make it through from LeafScorer to the path caches! Affects ALL Lucene queries that run OUTSIDE of a transaction.
   30729: Use getAuthoritiesForUser rather than getContainingAuthorities if possible.
   SiteServiceTestHuge: command line version
   30733: Performance improves to user dashboard relating to User Calendar 
    - converted web-tier calendar dashlet to Ajax client-side rendering - faster user experience and also less load on the web-tier
    - improvements to query from Andy
    - maximum sites/list size to query now configurable (default 100 instead of previously 1000)
   30743: Restore site CRUD performance from cold caches
   - Introduced NodeService.getAllRootNodes(), returning all nodes in a store with the root aspect, backed by a transactional cache and invalidated at key points
   - Means indexing doesn't have to load all parent nodes just to check for 'fake roots'
   - Site CRUD performance now back to sub-second with 60,000 nodes
   30747: Improvement to previous checkin - prevent cross cluster invalidation of every store root when a single store drops out of the cache
   30748: User dashboard finally loading within seconds with 60,000 sites, 60 groups, 100 users (thanks mostly to Kev's UI changes)
   - post-process IBatis mapped statements with MySQL dialect to apply fetchSize=Integer.MIN_VALUE to all _Limited statements
      - Means we can stream first 10,000 site groups without the MySQL JDBC driver reading all 240,000 into memory
   - New NodeService getChildAssocs method with a maxResults argument (makes use of the above)
   - Perfected getContainingAuthoritiesInZone implementation, adding a cutoff parameter, allowing only the first 1000 site memberships to be returned quickly and caches to be warmed for ACL evaluations
   - New cache of first 10,000 groups in APP.SHARE zone
   - Cache sizes tuned for 60,000 site scenario
   - Site service warms caches on bootstrap
   - PreferencesService applies ASPECT_IGNORE_INHERITED_RULES to person node to prevent the rule service trying to crawl the group hierarchy on a preference save
   - WorkflowServiceImpl.getPooledTasks only looks in APP.DEFAULT zone (thus avoiding site group noise)
   30749: Fix compilation errors
   30761: Minor change to SiteServiceTestHuge
   30762: Derek code review: Reworked fetchSize specification for select_ChildAssocsOfParent_Limited statement for MySQL
   - Now fetchSize stated explicitly in a MySQL specific config file resolved by the HierarchicalResourceLoader
   - No need for any Java-based post processing
   30763: Build fix: don't add a user into its own authorities (until specifically asked to)
   30767: Build fix
   - IBatis / MySQL needs a streaming result statement to be run in an isolation transaction (because it doesn't release PreparedStatements until the end)
   30771: Backed out previous change which was fundamentally flawed
   - Resolved underlying problem which was that the select_ChildAssocsOfParent_Limited SQL string needs to be unique in order to not cause confusion in the prepared statement cache
   30772: Backed out previous change which was fundamentally flawed
   - Resolved underlying problem which was that the select_ChildAssocsOfParent_Limited SQL string needs to be unique in order to not cause confusion in the prepared statement cache


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-09-27 12:24:57 +00:00
Dave Ward
419ecfb9e7 Merged V3.4-TEAM to HEAD
24882: Branch for Team
   24883: Version Edition label
   24906: Partial implementation of ALF-6566. Replace gears image...
     This check-in adds support for the feature as described in JIRA. However we do not yet have
     the icon graphics files. I have therefore used some temporary icons in order to flush out
     implementation issues and to enable browser-based testing.
     A future check-in will add the correct placeholder icons and if they follow the naming
     convention, no change in code should be necessary.
   
     Also added and modified some test cases.
   24909: ALF-6606: Configurable sorting for Share Document Library. Also change Show/Hide Folder button to icon. (Placeholder icons)
   24914: ALF-6564: Initial cut of JMXFormProcessor, will show all attributes of a given MBean and has the ability to persist an attribute value.
   24916: Initial Alfresco Team project structure and build targets
   24917: First tranche of thumbnail icons for ALF-6566. Replace gears icon.
     Have added icons for some basic mime types and removed some temporary icons.
     I had to do a clean repo build to flush out the temporary docx and jpeg icons.
   24919: svn ignore patterns
   24922: Missed files for team build targets
   24932: Add a simple AVM to Zip exporter service, initially for use by the site exporter
   24935: Start on a java backed webscript to export a site, including all the details (ALF-6567)
   24945: Removed two unnecessary TODOs from the RatingService code.
   24949: Improved documentation for RatingService webscripts.
   Added sample JSON responses for two webscripts.
   24956: Implementation of ALF-6792. RatingSchemes should allow self-rating.
     Formerly, the cm:creator of a node could never apply a rating to it. An unchecked RatingServiceException would be thrown if they attempted to do so.
     With this check-in ratingScheme beans have a new property: selfRatingAllowed. The exception will now only be thrown if a cm:creator attempts to rate their own content in a scheme where this property is false.
     The property is true by default and in particular, is true for "likesRatingScheme".
   24958: ALF-6599: First pass DND file upload - FireFox4/Chrome support for single/multifile DND upload with basic progress
   24961: Added additional data to the response coming from rating.post.
   I have added averageRating, ratingsTotal and ratingsCount to that response.
   24963: ALF-6625: Balloon Popup Framework. Initial checking. More work maybe required when we start using it, or when designs are complete.
   24964: ALF-6598 "Configure Site page refactor"
   - page.lib.js - Freemarker lib to sort out used pages and which links and labels to use
   - Drag n drop
     * now supports horisontal lists
     * improved tabfocus and keynavigations
     * callbacks can be attached on dnd events: delete-clicks, enter-clicks, element-moved, element-duplicated
   - Alfresco.util.isVisible - Checks if the element and all its parents are visible and displayed in the ui.
   - Alfresco.util.PopupManager.getUserInput now accepts a "input" parameter that can be set to "text" ("textarea" is default)
   - Automatic click listeners can be defined as: 
     <a href="#onRenameClick" class="${el}" rel="${page.pageId?js_string}">${msg("link.rename")}</a>
     which will call:
     onRenameClick: function(pageId, anchor) {}
   24965: Changing date format of appliedAt JSON property to xmldate.
   24971: ALF-6600: Event handling performance improvements for DND file upload
   24976: Added team.war to continuous assemble-tomcat
   24977: ALF-6600: Initial pass at DND upload highlighting
   24979: Add method AuthorityService.getAuthorityNodeRef, and unit tests for it
   24980: UI label change for Team install
   24981: Set security permission on the new AuthorityService.getAuthorityNodeRef method, in line with the other get methods
   24987: ALF-6607 - Likes, favourite and comment actions. Also DocLib panel redesign. Updates to Rating Service to better match Team use cases.
   24989: ALF-6601: Added JavaScript multipart data constructor for FireFox 3.6 support
   24990: Fix "Access Denied" error when navigating into a "Liked" folder.
   25000: Merged V3.4 to V3.4-TEAM
      24999: ALF-6764 - Updated copyright year to 2011
   25004: ALF-6601: Set file size limit, HTTP status code error handling
   25007: Add user, group and person ACP exports to the Site Export webscript.
   (The user export is provisional, pending a service level way to access the user NodeRef)
   25008: ALF-6788: Update dashboard template to provide full width component and presets updates to reflect new default layouts.
   25017: Initial check-in for ALF-6809. A service to managed deleted items.
   This check in adds a basic REST API for GETting and DELETEing deleted items from the archive store.
   JUnit tests of the REST API are included but are not yet complete.
   
   25018: Trivial fix for failing test case related to ALF-6809
   25019: A previous check-in (25017) accidentally included an extra Java file that wasn't ready.
   File is related to ALF-6809 and will be implemented today.
   This check-in removes the internals of the class to allow it to compile.
   The class is not injected into the spring application context and is essentially dead code pending its implementation later.
   25027: Adding nodeType to the archivednodes.get webscript response.
     Requested by UI as part of ALF-6809.
   25035: ALF-6789: Personal dashboard welcome (with wireframe styling)
   25036: ALF-6782 - Undelete administration console page (WIP)
   ALF-6784, ALF-6786, ALF-6787
   25037: ALF-6564: Added operations to default form, all parameter-less operations are displayed as a button on the form. Clicking a button executes the operation after saving all attribute values.
   25038: Added a node filter to the archivednodes.get webscript. Currently excluding cm:thumbnails.
     A new bean on the script's controller class that allows injection of nodetypes to be excluded.
     Should be trivial to exclude other node types later and easy to exclude based on other criteria.
   25039: Part of ALF-6809. Deleted items were returned from archivednodes.get in the wrong order.
   They are now sorted by archive datetime most recent first. (Was previously sorted with most recent last.)
   Also switched the test case, which was backwards too!
   25040: Changing some copyright headers from 2010 to 2011.
   25041: ALF-6564: JMX forms can now be configured with selective attributes and the set of operations. Also includes an example form configuration for the outbound email almost matching Linton's wireframes.
   25042: ALF-6788: Fix rendering of old (V3.4) user dashboards stored in AVM with new Team layout
   25044: Part of ALF-6809. Added displayPath value to archivednodes.get.
   25047: Part of ALF-6809. Reconfiguration of cm:thumbnail archive behaviour.
   Formerly, we were archiving cm:thumbnails on deletion and filtering them from the archivednodes.get webscript which was not ideal as they remained in the archive.
   This check in removes the filter on the GET webscript and prevents cm:thumbnails from being archived in the first place.
   25049: ALF-6782
    - added Trashcan to admin tools menu
    - cleaned up list, show display path
   25050: ALF-6782 - css tweaks
   25052: Added check for multiple calls to onHistoryManagerReady() as workaround for issue with multiple History Manager objects when using Alfresco.util.DataTable.
   25053: Test case refactoring as part of ALF-6809
   25055: ALF-6803: First drop of aggregate file upload progress information.
   25056: Part of ALF-6809. A preliminary PUT webscript that is used to restore nodes from the archive to their original loaction.
   Currently only works on a single node per call (which is what the JIRA requires).
   Test code currently incomplete. I'm checking in now to give UI something to work with.
   25057: Fix for failing test case, which was part of ALF-6566.
   25058: ALF-6567 - AVM importer, which can load a zip file's contents into a specified AVM filesystem. Includes a bootstrap wrapper around the main importer.
   25068: Part ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
     - Subtask of ALF-6832: AT17: License restriction reporting
     - Added RepoAdminService.getRestrictions in Java and Webscripts APIs
     - Currently nulls returned indication 'no restrictions'
     - Cleaned up unused AdminService
   25069: ALF-6625 - adds a switch to control what calendar views are enabled and switches off Day, Week and Month views in Team.
   25073: Test case overhaul and minor tidying of code. Part of ALF-6809.
   25074: ALF-6803: Style updates to upload progress info
   25075: ALF-6601: Updated in-memory file upload check so that failure is based on total (not individual) file size.
   25081: Merged V3.4 to V3.4-TEAM
      25051: Build Fix: ALF-6865 CopyServiceImplTest.testCopyToNewNodeWithPermissions failing on permission copying
   25082: Part ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
     - Subtask of ALF-6832: AT17: License restriction reporting
     - Added RepoAdminService.getUsage in Java and Webscripts APIs
   25084: Improve how the Site Exporter gets at the users for a site, and have the user authentication details export skipped if a non-repository based authenticator is enabled
   25085: Final part of ALF-6809. Support for paging the results from archivednodes.get.
   Follows the standard maxItems, skipCount convention and enables paging in the trashcan view automatically thanks to Kev's use of the convention.
   25088: Final, final part of ALF-6809. Throwing 4xx, 5xx exceptions for nodeArchiveService-level failures to restore nodes
   25090: ALF-6601: Updated in-memory upload limit to be configurable
   25096: ALF-6601: Updates to DND highlighting and behaviour, set correct upload limit in bytes, NLS updates
   25101: Fixing failing test cases. Fallout from recent changes to the JSON response formats in these webscripts.
   25103: ALF-6613 - SpringSurf improvements to allow easier refactoring of Document Details page
    - latest SpringSurf libs with RequestCachingConnector improvements
    - removed manual request level caching of remote calls responses in web-tier components - now completely automatic
   25104: ALF-6803: DND upload dialog styling
   25106: ALF-6802: Added feature detection to disable drag'n'drop events (disables for IE6, IE7 & IE8)
   25108: ALF-6564: Added a check to the JMXFormProcessor to ensure the current user is an administrator. Also relaxed the rules in the checkbox control so it can be used for string values not just boolean values.
   25113: ALF-6789: Updated CSS to support IE6/IE7
   25116: Prevent server-side exception when navigating trashcan; related to paging. (ALF-6809)
   25117: ALF-6824 - Only show "Like" and "Comment" actions if a user has the correct permissions. Additional fixes for IE7.
   25118: Fix incorrect category aspect name. Missing file from r25117
   25119: ALF-6645 - Share and Team branding updates
   25121: Removed erroneous comment block
   25123: Merged HEAD to BRANCHES/V3.4-TEAM:
      25115: Fixes: ALF-6336 - resolved incorrectly translated date formatting strings.
   25124: Add a new bootstrap component for bootstrapping Sites. Handles the contents, AVM and authentication, people and their group membership to follow. 
   (Uses singleton spring beans in line with the patch service's use, to ensure that when loaded from a bootstrap extension things still occur in the correct order)
   25128: Merged V3.4 to V3.4-TEAM
      25127: Merged V3.3 to V3.4
         25126: ALF-6903 - Share theme feature does not work. Also fixes issue with MultiThreadedHttpConnectionManager in SpringSurf.
   25130: Continue with the site bootstrapper - finish supporting the loading of the site contents ACP
   25132: Work on ALF-6832:TR25: License restriction reporting
    - ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - ALF-6911: RTEAM 02: Record and expose system attributes
    - Added RepoUsageComponent
      - Unit test incl. testLicenseUse
      - Persists and retrieves usage data using AttributeService
   25133: ALF-6789: Added "Close" link to dynamic-welcome dashlet and associated webscript
   25135: ALF-6789: Add missing localization
   25136: ALF-6601: Defensively code against missing config
   25137: Fix up of transfer test.
   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.
   25139: ALF-6804: Disable drop outside of document list
   25140: ALF-6887 - for sending HTML emails
   - prelim support - either text explicitly starts with "<html" and/or is passed via new HTML param
   25141: Updated version to 3.5.0 for Team
   25142: ALF-6834 - activities feed email notification (1st cut)
   - for sprint 1 demo (ALF-6928, ALF-6929, ALF-6931, ALF-6932)
   - note: to demo ... manually copy "activities-email.ftl" into repo (/Company Home/Data Dictionary/Email Templates/activities) and configure your own email address (for one or more users)
   25145: ALF-6602: Added first time instructions for DND upload
   25147: Merged HEAD to BRANCHES/V3.4-TEAM:
      25100: Fix for build issue Steve was encountering on new build boxes using Ant 1.8.x
   25151: ALF-6790: Updated CSS and images to match latest mockups
   25161: Basic support for canned queries
    - ALF-6910: RTEAM 01: Query support for system-wide attributes (ALF-6832)
    - At this stage it only has support for count-style queries
    - General-purpose change that will be needed for main Enterprise branches
   25162: Temporarily disables the balloon framework while I fix a bug in it.
   25163: Basic support for canned queries: extended tests
    - ALF-6910: RTEAM 01: Query support for system-wide attributes (ALF-6832)
    - General-purpose change that will be needed for main Enterprise branches
   25164: Further Site Export/Bootstrap work - support importing People (profiles for users), and placing them into the correct groups
   25165: ALF-6905 - RTEAM 04: Add restrictions to trial license
   25166: ALF-6644 - Theme per site.
    - Theme selection for a site and its child pages can be made in the Customise Site page
    - Framework now allows theme per application, site or page.
   25167: ALF-6790: First pass at new site dashboards welcome dashlets
   25168: ALF-6832 - RTEAM 19: Update DescriptorService
   25169: ALF-6906 - RTEAM 18: Report Team or Enterprise in startup log
   25171: ALF-6998 - activities feed email - reuse Share messages (including L10N)
   25172: ALF-6910: RTEAM 01: Query support for system-wide attributes
    - Added and call canned queries for users and documents
    - ALF-6832 TR25: License restriction reporting
   25175: ALF-6998 - activities feed email - fix build copy of activity-list*.properties
   25176: ALF-6962 - activities feed email - use configured share url (from sysAdminParams)
   => share.protocol, share.host, share.port, share.context (note: you may need to override for dev/demo env)
   25178: ALF-6564: TR12: Implement JMX Form Processor. Added tests, fixed a couple of bugs in form processor and added all Mike's form config for MBeans we're provisionally exposing.
   25187: ALF-6998 - activities feed email 
   - quick fix if running within repo-only context (eg. via Eclipse)
   25188: Prevented NPE with Enterprise edition built as community.
   25189: Expose getAllowWrite on the TransactionService API
    - This is a user-independent flag as opposed to isReadOnly, which makes allowance for the 'System' user
   25190: Work on ALF-6832:TR25: License restriction reporting
    - ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - Use TransactionService as the source of 'isReadOnly'
   25191: Fix to issue where null could be passed as URI Tokens
    - fixes issue where pages failed to render on first display since rev 25166
   25192: CSS tweak
   25194: I18N'd system startup message
   25195: Restrictions now sets current time and readOnly property.
   25196: ALF-6790: Added user prefs to enable site welcome dashlet visibility
   25198: ALF-6790: Fix user close welcome dashlet persistence. Added site welcome dashlet close reload.
   25200: ALF-6803: Update upload dialog title to display (encoded) folder name (not entire path)
   25203: ALF-6834 - TR15: Activities feed email notifications
   - ALF-6931 - RTEAM 23: update activity feed DAO to filter by min id and/or max items
   - ALF-6929 - RTEAM 21: now uses last feed id for each user
   - minor cleanup (eg. tweak template to deal with null message)
   25204: ALF-6790: Fixed broken site preference logic
   25206: Checkpoint ALF-6608 - Inline property editing - name field. Also paves the way for ALF-6611 - Inline property editing - any meta field. Currently does not constrain input values, nor handle repository errors (e.g. duplicate name).
   25212: ALF-6602: Updates to reflect latest designs
   25213: ALF-6564: More MBean form config
   25248: A new schema version range for 3.5
   25249: ALF-7049 - RTEAM 12: Disable Alfresco Explorer
   25252: ALF-7050 - RTEAM 09: Disable MT
   25263: Fix trailing comma for IE browsers
   25268: Implementation of ALF-6829 Popularity of a node (RatingService).
   
   This check-in is actually a fairly generic support for rolled up property values within rating schemes.
   Popularity is currently the only concrete rollup in the system, but it should be possible to add more without too
   much difficulty.
   
   Given the published API for the rating service, we have added rollups for "ratingCount" and "ratingTotal" for the built-in rating schemes (likes). Therefore searching/sorting on either cm:likesRatingSchemeCount or cm:likesRatingSchemeTotal, both of which are defined in an aspect cm:likesRatingSchemeRollups should give popularity for the likes rating scheme.
   
   
   Additions to the content model.
     I have added aspects, properties for the built-in rollups, namely count and total.
   
   Spring changes
     The rating scheme(s) now have rollups injected into them. These rollups are algorithm classes that know how to calculate the rolled up props.
     Naming conventions are used to determine the output property and are captured in RatingRollupNamingConventionsUtil.java.
   
   API changes
     New methods: RatingService.getRatingRollup(NodeRef, String, String)
     & RatingScheme.getPropertyRollups()
   
   Changes to the RatingService implementation and JUnit test code.
   
   To roll your own rating rollups:
     To add your own rating rollup, you need to reuse one of the existing AbstractRatingRollupAlgorithm subclasses or create a new one.
     That class will produce the value of the rolled up property by iterating the ratings in the given rating scheme for a given node.
     You need to inject your rollup algorithm into the rating scheme bean in rating-services-context.xml
     On applyRating() and removeRating() the RatingService will check the rating scheme for any registered rollup algorithms and will have them recalculated.
     It will then use the naming conventions described in the JIRA and in RatingRollupNamingConventionsUtil to get aspect/property names for each of the rollups.
     It will then add the property value in the normal way.
     Therefore, you need to extend the content model to include the expected aspect and property values. Follow likesRatingScheme for a sample.
   25273: Fix failing unit test.
   25274: DocLib sorting support for "popularity" (Likes rating scheme)
   25277: ALF-6602: Updated instructions to reflect new design. Info shown now dynamically based on site ownership/access rights/browser feature support
   25278: Merged BRANCHES/V3.4 to BRANCHES/V3.4-TEAM:
      25267: ALF-1070 - if site/user is deleted then immediately clean associated site/user feed
   25279: ALF-6601: Updated to handle 0 byte dropped files (or folders)
   25280: ALF-7009 WIP checkpoint
    - Also removed some code that is obsolete since ConsoleTool class extends Alfresco.component.Base
   25286: ALF-6599: Changed folder DND target back to image (not row)
   25298: ALF-7009 - Upload and replace Share logo
   25311: ALF-7080 / ALF-7002 - ActivitiesFeed subsystem (+ option to enable/disable job triggers)
   - moved ActivitiesFeed into subsystem for dynamic mgmt via JMX
   - FeedNotifier repeat interval can be dynamically changed
   - also added "enabled" property to AbstractTriggerBean => FeedNotifier job can be disabled / re-enabled
   25312: ROLLBACK (Partial) 25249 ALF-7049 Disable Alfresco Explorer.
   25313: ROLLBACK 25252 : ALF-7050 - RTEAM 09: Disable MT
   25317: ALF-6930 - bootstrap / patch activities email template
   25331: ALF-6890 - RTEAM 16: License-based restrictions: Number of users
   25333: Merged BRANCHES/V3.4 to BRANCHES/V3.4-TEAM:
      25319: Build/test fix (fallout from ALF-1070)
      25322: Build/test fix (fallout from ALF-1070)
   25356: ALF-6930 - bootstrap / patch activities email template
   - missed file, sorry !
   25358: ALF-6834 - Activities email: tweaks
   - pass through repeatInterval (to template model)
   - add exclude email list (eg. for default admin)
   25360: RTEAM 28: License restriction reporting: Force refresh
    - Added API for selective updates of usage data based on an enumeration: USAGE_USERS, USAGE_DOCUMENTS or USAGE_ALL
    - When people are added, for instance, usage will be updated and then retrieved for checking.
   25363: ALF-6639 - Default collaboration dashboard
    - NOTE: may need Team overlay version on merge if this change is *not* the default for Swift
   25364: Modified usage/restriction admin webscripts to use a common FTL lib for the json output and added some missing quotes around the license mode value.
   25365: ALF-6597: Added DashletTitleBarActions widget and applied to WebView dashlet
   25367: ALF-7082 - Remove Network Dashlet
    - Removed network dashlet from codeline
    - Support in WebScripts to allow hook for override of exception handling from webscripts for specific use cases
    - Surf LocalWebScriptRuntime overrides error handling looking for specific case of SC_NOT_FOUND - and silent ignores missing webscript components
    - Improved Share handling of missing webscript components that have already been bound into a dashboard (i.e. not a missing "slot" but an existing component binding that points to a missing webscript URL) - this will also allow for easier removal of other existing dashlets in the future without requiring repo-side patches or similar.
   25369: ALF-7042 (ALF-6832) RTEAM 28: License restriction reporting: Force refresh
    - Added unit test for update WebScript
   25375: Implementation of ALF-7024. Document versions service/webscript needs to return avatar url.
   The avatar url has been added to the JSON response as requested.
   If there is no avatar, a JSON null is returned as requested.
   25377: Add maxDocs, maxUsers and license mode to License JMX bean
   25378: Adding additional property to version.get webscript: a correctly-formatted ISO8601 date.
   This has been added as requested in the comments of ALF-7024.
   25381: Refactor of LicenseComponent and related to produce LicenseMode in descriptor (ALF-6907 RTEAM 19)
    - Need actual enum to do later usage updates according to mode
   25382: ALF-7053 - RTEAM 07: Disable Transfer
   25387: ALF-6564: Finished JMXFormProcessor (again). There is now a configurable list of operations to ignore, revert is ignored by default. The labels for the buttons are also localisable now.
   25390: Fixed up License MBean after changing the descriptor API
   25391: ALF-6911: RTEAM 02: Record and expose system attributes
    - Added job locking around individual usage queries
    - It is possible to concurrently update user and document counts
    - Exposed true/false return value on updates and added this to usages webscripts
   25392: Switched version edition back to Community
    - If we distribute Team using a community build, then we should know about it.
    - Team functionality is triggered by an Enterprise build or TEAM license.
   25393: Undid rev 25392
   25394: Work on ALF-6832:TR25: License restriction reporting
    - ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - ALF-6911: RTEAM 02: Record and expose system attributes
    - Added RepoUsageMonitor
      - Self-starting schedule
      - Only checks for restrictions that are in place
      - Issues warnings and errors; puts system into read-only mode on violation
   25403: ALF-6890 - Switch over of user query to database backed query.
   25408: WIP checkpoint for Agenda view refactor:
      - Adds Alfresco.util.friendlyDate to supply "Yesterday/Today/Tomorrow" style date
      - refactors getEvents into a common function in calendar-view.js (calendar-view-month not touched because it gets elements from the DOM rather than API)
      - Uses DataTables to display agenda events (currently unformatted)
   25410: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      25409: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
           25407: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
                25401: Allow continuous.xml database drop/create on postgresql and mysql to support the database being on a different machine
                25406: We no longer need a 2nd _test database for the unit tests, so remove the code that created/removed them during the continuous build
   25411: Fix to allow application logo to be uploaded with same filename as a previous logo.
   25416: Implementation of ALF-7100. Comments webscript doesn't return dates in iso8601.
   I added iso8601-formatted date fields jsut as for ALF-7024.
   25418: Implementation of ALF-7173. Remove the RatingService restriction whereby a single user can only rate a single node with one RatingScheme.
   Change to the RatingService javadoc so that it doesn't mention the restriction.
   Additional method in RatingService: getRatingsByCurrentUser - to return multiple ratings.
   Reimpl's testOneUserRatesInTwoSchemes test case from a -ve to a +ve test case.
   Rewrote the REST test cases slightly to cover the case of a single user multiply rating a node.
   Various changes through the apply() case to support this.
   25419: Change the Site Loading for ALF-6567 from a bootstrap to a patch. This means that if a site is loaded then deleted, it won't be re-loaded again.
   25420: Fixed unit test for ALF-6911: RTEAM 02: Record and expose system attributes
    - Forgot to prompt user usage changes to check numbers against
   25422: Addition of selfRatingAllowed field to ratingdefinitions.get webscript.
   As this is now a configurable property on a scheme, it should be reflected in the REST API.
   25423: Node rows that transition to the deleted state (not archive) are given type sys:deleted
   25425: Add an example extension context file to patch-load an exported Site, and allow the import path to use defaults to reduce the number of settings required
   25426: ALF-6597: Added temporary tooltip code for DashletToolbarActions (and updated to WebView dashlet to use it)
   25427: ALF-6789: Removed dynamic welcome dashlet from add dashlets menu
   25428: ALF-6599: Removed encoding of spaces in displayed location name on DND upload to folder
   25430: ALF-6890 - tweaks to query and person service for user limit stuff.
   25432: ALF-6597: Updated DashletToolBarActions to ensure fade in on first mouseover
   25433: Implemented ALF-6613, ALF-6614, ALF-6615, ALF-6616, ALF-6617, ALF-6618, ALF-6619, ALF-6620, ALF-6621, ALF-6622 - PART #1 
   - ALF-6613 TR22: Document Details page improvements
   - ALF-6614 Page redesign and refactor
     * Components are atomic and doesn't need global events to work.
   - ALF-6615 Document Actions panel
   - ALF-6616 Tags panel - NEW, replaces the old "info (tags+permissions)" component
   - ALF-6617 Share links panel
   - ALF-6618 Properties panel
   - ALF-6619 Permissions panel - NEW, replaces the old "info (tags+permissions)" component
   - ALF-6620 Workflows panel
   - ALF-6621 Version History panel
   - ALF-6622 Comment component redesign and refactor
   - alfresco-macros.lib.ftl
     * <#function uriTemplate id> 
       Helper for getting a uriTemplate in freemarker
     * <#function userProfileLink> 
        Helper fopr rendering a userProfile link in freemarker
   - alfresco-util.js - Rhino Javascript-helpers
     * function error(code, message, redirect) 
       Helper for redriting and throwing a webscript error
     * function param(name, defaultValue)
       Helper for placing a webscript "param" in the model, lloks for param in the following order args, page.templateArgs, properties, defaultValue. 
       If no value is found and no default value was given an error is thrown.
       Useful to avoid webscripts "crashing" when accessed from /service/ rather than from /page/ path, i.e. when refreshed/reloaded using ajax.
     * function getRepositoryUrl()
     * function getRootNode()
     * function getDocumentDetails(nodeRef, site)
   - alfresco.js
     * New in Alfresco.util.DataTable
       c.dataSource.doBeforeParseData - to modify response before rendering, i.e. if an array is the respons rather than an object
       c.dataTable.config.className - if another css class than alfresco-datatable shall be used
       c.paginator.history - set to false to avoid browser history management to kick in
       reloadDataTable() - to reload
       getData(record) - to get data related to a row in the table
     * sanitizeMarkup() - moved out code from request(), strips out <script> tags from html
     * New in Alfresco.base.Component
       - createYUIButtons()
       - attachLinkClickListeners()
       - refresh(url) - gets new markup from server and replaces the old and unregisteres the js component instance
   - base.css 
     * .alfresco-twister-actions - use this class to place actions in the twisters that are visible when twister is opened
     * .document-version - common css class for version label
     * .alfresco-datatable - Common styling for datatables created from Alfresco.util.DataTable, 
        gives list like appearence and removes headers and bprders.
   - NOTE! Tested in FF3.5 & SF4, PART #2 will contain: 
     x-browser testing, tidy up comments form, social gadgets in header, activities after new version upload
   25437: ALF-6789: Added confirmation dialog for welcome dashlet close
   25439: More WIP for Team's Agenda view. General clean up, code commenting and start of styling.
   25443: ALF-6597: Added actions to remaining dashlets
   25451: Site label suffix removed from title bar
   25452: ALF-7053 - Disable Replication Service
   25453: ALF-6599: Disabled DocLib DND upload when viewing non path filters (and fixed filter view bug that was previously introduced)
   25454: Stub out the user upload via CSV webscripts
   25455: Implemented ALF-6613, ALF-6614, ALF-6615, ALF-6616, ALF-6617, ALF-6618, ALF-6619, ALF-6620, ALF-6621, ALF-6622 - PART #2
   - components doesn't break when accessing a working copy OR a repository document (non site)
   - remove som unecessary code that slipped in with comments-list.js
   - "Add comments" now clears the editor before the next add
   - Comment paginator is only visible when necessary (happens to all paginators by default,force show with c.paginator.hide=false)
   - removed the document-details.ftl instantion of the javascript class
   - version panel isn't rendered on doc details page for working copies 
   - versions panel had white background under text "No previous verisions exist"
   - code commenting sweep 
   25457: ALF-6599: DND event listener fix
   25460: CSS tweak to document path
   25461: ALF-6790: Updated links for invite and upload for managers/contributors
   25462: ALF-6811: Added upload users CSV button to existing user admin console page. Stubbed code for invoking WebScript
   25470: Some build fixes
   - in general running without an authenticated user
   - getPerson -> getRestrictions without any security context
   25473: Added csv, xsl, xslx formats/mimetypes to default list for webscripts.
   25475: ALF-6608: Inline property editing - name field
   ALF-6625: TR04: Balloon popup (tooltip) component
   Also Document Library restyling: rollover style, text removed from most buttons, new icons.
   25476: Repository Browser brought up-to-speed with latest Site DocLib changes.
   25477: TEAM build fixes
   - fix unprotected service not to use public services - allows repoAdminService to be wired up to personService
   - There may be collateral damage to test using the messageService
   25482: Add the Apache Commons CSV library, and also fix the classpath breakage caused by the postgresql jdbc jar switch
   25483: Implementation of ALF-7005. TR24: Remove inappropriate rule script actions.
   Both sets of script actions (email templates and scripts) are built up using FolderContentsParameterConstraint objects.
   Using this class a location in the repo is specified and all cm:content children under that location (recursive) are included.
   I have added a new, optional property to that class which allows the specification of a list of file extensions, which is used as an inclusion filter for the content nodes.
   I decided against using a MIMEtype-based filter as there are situations where users add e.g. .js files as text/plain.
   Then I inject "js" and "ftl" as inclusion filters in the relevant action-constraint beans in the action service.
   We can easily add further file extensions should it be necessary.
   
   25484: ALF-6597: Fixed IE6 selector issue
   25486: ALF-6597: CSS correction to r25484
   25488: Small adjustments to descriptor logging during startup.
   25489: Team Eclipse project
   25491: ALF-6789: CSS tweaks to welcome dashlet columns
   25492: Get the basics in place for the user CSV upload - provides a sample csv file, loads it, process the contents and reports a JSON response, but doesn't yet create the users
   25495: ALF-6642: TR08: Site only view - remove Repository view.
   Copy and Move to dialogs only display Sites destination in this mode.
   Note: Page mapping not removed until it's clear how this will integrate with the installer; hence manually browsing to the Repository Browser is not pretty right now.
   25496: Minor follow-up fix for Repository Browser.
   25497: Support for ALF-6642 on details pages.
   25499: Document Library sort improvements: individual sort parameters can now be given a default sort order (like the Share search results page). Currently configured as name: ascending, popularity: descending.
   Also added support for "#upload" in URL to show the upload dialog.
   25500: ALF-7120: TR03: Test and integrate sample site into bootstrap process
   
   NOTE: This will install the Work In Progress sample site to your repository next time you start the repo. 2 new users will be added and will count towards your allocated users, you can safely delete the site and the users, they will not get re-loaded.
   25501: When generating the example file for the user CSV upload, have the webscript generate .xls and .xlsx versions, as well as the previous .csv one.
   25502: ALF-6790: Update upload link to #upload to get upload dialog
   25503: Team build fix: Fix message service tests after changing the beans wired up
   25505: New requirements for ALF-6617 "Share links panel", now only displaying link to current page
   25507: ALF-6640 - WIP. Initial styling pass, event actions, etc.
   25511: ALF-6789/ALF-6790: Removed old welcome dashlets
   25512: Resolve ALF-7099: Duplicate view:reference entries in an ACP export created using multiple noderefs
   25514: General cleanup of implementation and use runAs to query Admin-only service
   25516: More ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - Added 'licenseValidUntil' to web script returns (may be null)
   25518: Harden MessageServiceImplTest against leaked transactions
   25519: Refactor the common code for dealing with tenant usernames + tenant domain checking, during person creation, out to the person service
   25521: ALF-7099 export follow up: emit associations after all objects
   25523: Add support to the User CSV Upload webscript to actually create the people and users, using the new common service methods in common with share
   25524: Implementation of ALF-7093. Transfer/replication actions must not be displayed when the transfer service is disabled.
   
   Note: It is the ReplicationService which is enabled/disabled as opposed to the TransferService.
   A new webscript has been added (available at GET /api/replication-service-status) which returns 
   {"data": {"enabled": true}}
   
   Also a new REST test case.
   25525: ALF-6911: RTEAM 02: Record and expose system attributes
    - made getRestrictions() accessible to 'guest'
   25526: Update the user csv upload webscript with some debug log entries, and excel support
   25528: ALF-6602: Updated to new (temporary) images, updates to CSS
   25535: Removed deep svn:mergeinfo.  Please merge from base of code lines and remove spurious svn:mergeinfo
   25536: Merged V3.4 to V3.4-Team
      25399: Fix for ALF-6991: "Connection pool causes poor performance in some test suites"
             - applied constructor fix recommended by https://issues.apache.org/jira/browse/DBCP-330
      25400: Fix for ALF-6991: "Connection pool causes poor performance in some test suites"
             - commit missed file
      25474: Eclipse classpath tweaks to prevent element-based entry for Commons DBCP
   25537: ALF-7094: First cut of TR24: JSF-based login screens should warn unsupported when in Team mode. The wording needs reviewing and changing as does the position and styling of the text.
   25542: Implementation of ALF-7182. TR20: When a user 'likes' a document it appears in the activities feed.
   MikeH gave me the JavaScript changes for this in Share tier. Thanks Mike.
   I added some ftl and properties.
   25546: ALF-6602: Further image and CSS tweaks to doc lib assistance
   25548: Enhancements to user limit error reporting (ALF-6890: RTEAM 16: License-based restrictions: Number of users)
    - Report the usernames being added that generate the limit violation
   25549: ALF-6789: CSS updates
   25551: Fixed bug in Alfresco.util.DataTable when setting default css class name (appearing i.e. on trash can admin ui)
   25552: Minor cleanup in createPerson code.
   25554: ALF-6635 "TR12: Browser based administation - JMX admin console pages"
   25557: Updated version of sample site for Team, the full page width welcome dashlet is now present for both users.
   25559: First phase of ALF-6835:
    - Share now retrieves repository license/restrictions via REST API on first user login
    - Dynamically applies override config onto Alfresco config based on license info - allows Enterprise/Team specific tweaks to UI etc.
      - also constructs an object representing the license/restrictions that can be read by Surf components
    - Share Footer component now dynamically switches Community/Enterprise/Team logos and text based on config
    - Removed team project from source tree - NOTE: remove it from your local Eclipse projects
    - Removed team build targets - NOTE: devenv team targets will no longer work
    - Removed enterprise overlay for footer and share enterprise logo (no longer required due to dynamic footer configuration)
   25562: ALF-6835 - About Share dialog now displays appropriate edition logo and background based on license details
   25566: Allow users of the Mail action to pass in extra model options for their templates to use. 
   25568: When processing user CSV uploads, skip cleanly over blank lines
   25570: ALF-6811: Updated users admin console page and associated scripts to process WebScript feedback
   25572: ALF-6884 - TR25: Reload license file on live server via JMX operation on LicenseDescriptor mbean.
   25575: Agenda View WIP. Added add/edit/show more events functionality, bug fixes and styling. Updated Calendar API to include event description!
   25578: Bring user limit warnings in line with PersonService (create time) warnings
   25579: Repo usage monitoring done every 12 hours
   25580: ALF-6599: Update folder target highlighting & update temporary images
   25583: Fixes bug in Calendar Agenda view - number of days shown by default (was: from now - end of current month, is: from now until now + 30)
   25584: ALF-6602: Fix broken links on assistance panel
   25585: Branding and CSS tweaks from Linton
   25587: Wrap the User CSV upload result json in a data block, to better fit the current pattern
   25591: In the User CSV upload webscript, correct line numbers in error messages for excel uploads
   25593: Dashlet title rollover behaviour changes. Insitu edit balloon now removed when textbox loses focus.
   25596: Impl of ALF-7175 Comment order ... changed.
   This check-in adds a repo-side webscript parameter to reverse the order of comments
   25599: ALF-7233 remove doc for changing server.transaction.allow-writes
   25601: ALF-6811: Update to users.js to handle modified JSON response from WebScript
   25602: Agenda View, Bug fixes and CSS tweaks.
   25605: The empty 'Operations' set no longer appears in view mode and made the mail.password field behave like a password field
   25606: Tweak the JSON to better fit the current layout standards
   25607: Add a few more fields to the User CSV upload, based on the fields in Share
   25609: ALF-6645 - Branding tweaks
   25613: Help URLs moved to new edition based config - removed enterprise overlay.
    - NOTE: final 3.5 URLs still to be decided!
   25624: ALF-6789/ALF-6790: Updates to CSS/DOM to achieve completely fluid vertical and horizontal layout
   25626: ALF-6789: Updated profile to provide #edit hash and welcome daslet to make use of it
   25628: ALF-7207 - activities feed email / mail action executor
   - mail action executor should not get (+ auto-create) person when running as System
   - prepare / send email for each person as a separate txn
   - also: add actual / max feed item counts to template model  (as per ALF-6834)
   25631: Share Admin Console tool groupings
    - Implemented basic groups of tools in the admin console
    - First attempt at grouping tools - needs review by Linton/MikeF
   25644: Disable repository searching for team license configuration.
   25646: ALF-6835 - License details shown on License Descriptor admin page
    - Fixed up out-of-date JMX form bean names (changed on repo side since original JMX form config)
   25647: Team Agenda View - no events text, and other minor fixes
   25648: ALF-6811: Updates CSV WebScript response, added HTML format handling, added results panel to user console.
   25650: File missed from check in 25647
   25652: Start to convert the User CSV uploader to using localised error messages and error responses rather than non-localise exceptions
   25653: Added MikeF's url templates for ALF-6628 TR23: Preview support for Flash Video and HTML5 video.
   
   25654: ALF-6835 - Edition Interceptor improvements
   25655: Update how the User CSV Upload webscript returns messages and errors. Makes use of a property loaded via a resource bundle, and a new extension to WebScriptExtension which is driven by a supplied ResourceBundle, rather than the system-wide ones (which don't hold webscript specific messages)
   25656: ALF-6789/ALF-6790: Updated text, CSS/DOM tweaks & update to site-members to provide all members hash for welcome dashlet
   25658: ALF-6811: Updates to HTML format response for CSV request to support HTML uploader
   25659: Partial implementation of ALF-7230.
   This check-in changes the bootstrap data within the acp such that the sample JavaScript files in Data Dictionary/scripts are now bootstrapped as *.js.sample.  Their content has not been changed.
   Note that this applies to backup.js, example test script.js, backup and log.js, append copyright.js, alfresco docs.js and test return value.js.
   A separate solution will be provided for the command-*.js scripts.
   
   25660: Better reporting of the script causing stream errors
   25661: ALF-7231: RTEAM 32: FileFolderService method to get localised file
    - Locate the base translation using the well-known QName path (selectNodes) - this is the current way.
    - Call this additional method to locate any localized siblings
   25662: ALF-7263 - Track multiple reasons why we are read only otherwise we can't go back to read/write.
   ALF-7220 - Repo Usage Component Unlock
   25663: ALF-7256 - Ensure license reload does not damage server after upgrades
   25666: ALF-6811: Fix success message for all users uploaded
   25668: Increased user limit to 10 users for trial license
   25672: Some formatting
   25673: Minor comments format from Javadoc to inline
   25674: User count reporting: Keep track of disabled users on person
    - Disabling a user adds an aspect to the related person object
    - Should be able to export after disabling user
    - Don't count disabled persons
    - User count is reduced by 1 to cater for 'guest'
    - RTEAM 16: License-based restrictions: Number of users
   25679: A little more information is now returned if an error occurs whilst persisting MBean attributes or invoking an MBean operation.
   
   The sample site root node is prevented from being archived when it's deleted during the sample site bootstrap process.
   25681: ALF-6789: Change "Close" to "Remove"
   25685: Agenda View: Fixes Tagging.
   25686: IE fixes and slight change to the "automatic" binding from button/links against a component (value/rel attribute is now treated as a simple string instead of as an object)
   25688: Agenda view - new sketch logo from Linton for when there are no events
   25689: Feed edit icon css class
   25690: Invite test uses disabled users
   25691: ALF-7229 - partial (for Activities Feed Notifier)
   - also cleanup IoC deps
   25693: Work in progress ALF-6593: TR04: Update dashlets to provide consistent look & feel, include thumbnails, help text, action links where applicable
   25694: MERGED V3.4-BUGFIX to V3.4-TEAM
      24898 : Fix to FixUserQNamesPatch
   25695: ALF-6789/ALF-6790: Added new icons, removed old ones
   25697: ALF-7231: RTEAM 32: FileFolderService method to get localised file
    - Fixed extraction of 'base' name to be parts before *first* period
    - Changed unit test to use 'Something.html.ftl'
   25698: IE7 bug fix (a comma sign had slipped in by mistake)
   25701: Continued implementation of ALF-7230. Bootstrap data amendments and additions for Team.
   This changes the name of DataDictionary/EmailTemplates/NotifyEmailTemplates/notify_user_email.ftl to .../notify_user_email.ftl.sample.
   With this check-in there will now be no .ftl files available for the Rules UI's "send email" action. The "Use Template" dropdown will have no contents. A future check-in will add the new (i18n'd) ftl files.
   25702: Adds options support to Alfresco.widget.Resizer & updates console and calendar templates to use it. Tweaks styling on calendar to make it behave.
   25703: Update the FileFolder localised version tests to do both Standard.html/Standard_fr.html and Another.get.html.ftl/Another_fr.get.html.ftl so we test both cases
   25704: Provide a util helper for building Share and Alfresco (Explorer) urls up from SysAdminParams
   25705: ALF-6628TR23: Preview support for Flash Video and HTML5 video.
   - Customisable plugin architecture added for web-preview component, ootb plugins are:
     * WebPreviewer: for documents (and image & flash movies) in other words the "good ol previewer"
     * FlashFox: .mp4 & .flv videos for users w FlashPlayer 9
     * StrobeMediaPlayer: .mp4 & .flv videos for users w FlashPlayer 10
     * Video: HTML5 <video> element, support depends on the browser, but if youre lucky it might support .webm & .ogv movies
     * Image: Displays images using the <img> tag (if taken from the nodes content and the image is larger than 0.5 mb, a link must be clicked to get the conten displayed).
     * Flash: embeds flash content using swf-object
     * plugin kicks in depending on node's mimeTYpe & thumbnail in combination w rules defined in web-preview.get.config.xml
   - Added new mime types to repo:"video/ogg", "audio/ogg", "application/ogg" & "video/webm"
   25706: ALF-6628TR23: Preview support for Flash Video and HTML5 video. part 2
   - some strange white space characters had made their way in 25705
   25708: Add new notifyPerson method to the Person service. This sends an email to the newly added user telling them their credentials, where to log in etc. 
   (Email template patch to follow)
   25709: Use the new user notification method on the Person Service if requested, through the user CSV upload and person script service. It is on by default for CSV uploads, and off by default for javascript (Share)
   25710: Add security file missing from earlier PersonService.notifyPerson checkin
   25711: Further impl of ALF-7230.
     Ensuring that the (recently renamed) notify_user_email.ftl.sample file has a qname path which is .sample-based.
   25712: ALF-6835, ALF-7093 - Various improvements to Admin Console related to showing appropriate components based on license edition and admin console tool groupings.
    - JMX tools now only available when an appropriate Enterprise license is found
    - Subset of JMX tools available for TEAM edition
   25713: Library updates for rev 25712
   25719: Fix Alfresco.util.DataTable first request after r25693. Slight tweak to console tools list CSS for readability. Also modify how item separators work in social panel.
   25722: Fixes broken links in wiki page within Team sample site
   25732: Added quicktime move to the list of supported previews
   25733: Added localised model title and descriptions for all the cm:person properties
   25735: Revert non-English message bundles
   25736: Document Library folders defaulted to visible on first use.
   25739: Workaround for exceptions during bootstrap of clean db.
   Changes to the email template acp introduced an exception. The changes are related to ALF-7230.
   25740: Added read-write locking around veto code
   25741: Patches runAs 'System' to allow execution even in read-only environment
   25742: Patches runAs 'System' to allow execution even in read-only environment
   25743: Removed some javadoc-style comments within methods
   25744: Enhanced usage GET method
    - Currently, I have problems preventing real data from being returned; so see dummy data
    - Made usage GET a guest operation
    - Included 'level', 'warnings' and 'errors'; see usage.get.desc.xml.
   25745: Fix typo in error message
   25748: ALF-7094: TR24: JSF-based login screens should warn unsupported when in Team mode (final text from Linton/docs)
   25749: Make an unrestricted license available in the build classpath of each version
   25750: ALF-6622 "Comment component redesign and refactor"
   - Current user's avatar is displaye in add comment
   - editor is correctly configured and styled and uses full width
   25751: ALF-6602 - Final drag'n'drop icons and text from Linton/docs.
   25752: Email templates for new user notifications, and a patch for this (applicable to both new and existing installs)
   Note - acp may need a refresh later for tweaked templates, and description tweaks, but it shouldn't be a problem for anyone who gets this version now
   25753: Reduced property path console logging on startup
   25755: More acp hacking for ALF-7230.
     Now the property key is defined in bootstrap-spaces.properties. Oops. Mustn't forget that next time.
   25756: Update the User CSV scripts to use the new titles and descriptions for the person model, in both the template, and in the upload when skipping over title rows
   25757: Tweak the User CSV upload template to show the descriptions properly in all excel versions
   25758: Usage messages for usage web scripts
    - Fixed unit test fallout
    - Added license timeout as a restriction/usage element
   25759: Fix for making "poster" attribute to videos understand the filesuffix of a thumbnail
   25761: Fixed template to remove redundant 'warnings'
   25762: Add a note about why this class generates mail text itself, via dedicated template service calls, instead of following the new pattern of passing a template noderef + model to the Mail Action Executor
   25763: Update the site invitation mail action to enable the use of localised email templates (where present), and update to the new noderef+model pattern (rather than processing the template in the class)
   25764: Fixed bug where it was only possible to upload a new version once on the docuemnt detais page, also small css tweaking in the version list
   25765: Fix for ALF-7337 Email with content shorter than 5 chars causes exception in MailActionExecuter.
   A simple fix that tightens up some string comparison.
   25766: JMX MBean error handling: UI now shows the error message returned from the form processor. As the raw error message is being shown I have also localised the error messages on the server.
   25768: Sample site users are now loaded in a disabled state so they do not count towards the user count. The main wiki page also had a broken link to one of the images in the project library which is now fixed.
   25771: Removed organization id from the CSV upload as it's not used anywhere in the UI
   25772: Added protection for the usage.users or usage.documents properties being null
   25775: Removed unused warning suppress
   25776: Minor formatting
   25777: Added ability to get transactions that don't respect read-only vetos
    - Typically used by doing
          RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
          txnHelper.setForceWritable(true);
          ...
    - This ranks with the 'Run As System' for permissions, but allows a clean separation between permissions and transactions.
    - Don't have to force everything to run as 'System' to get a writable transaction, but 'System' will still have one.
    - ALF-7236 RTEAM 34: Reload Licence fallout
      - ALF-7256: Ensure license reload does not damage server after upgrades
   25778: Allow patches to run against read-only system
    - Made a write-forcing RetryingTransactionHelper available for patches and their offspring worker threads
    - main upgrade thread is already running as 'System' user
    - ALF-7236 RTEAM 34: Reload Licence fallout
      - ALF-7256: Ensure license reload does not damage server after upgrades
   25779: ALF-7257: Changed read-only setting to server.allowWrite to avoid mixing with Spring config
   25780: Further impl of ALF-7230.
     This check-in includes a patch which bootstraps a .html.ftl notification email template and placeholder templates for supported locales es, fr, de, it. (The notification email has a broken link in it. I will fix that today.)
   25781: Inbound Email admin console tool disabled for Team edition
   25782: Agenda View style fixes, non-default theme updates and description expand.
   25784: Added MBean form config for the IMAP susbystem.
   25786: ALF-6635 - Added IMAP admin console component
   ALF-6835 - License component improvements
   25790: ALF-6835 - Show license info warnings/errors. Show SysAdmin JMX console component so share host/port can be set for email templates.
   25791: Build fix for recent changes (labels being added, scripts being renamed and site membership URL cleanup)
   25794: Add missing admin user exclude to the people export with a site
   25795: Further impl of ALF-7230.
     Added a new acp containing a new example JavaScript file & a patch to bootstrap it in.
   25796: Removing unnecessary property values. As part of ALF-7230.
   25799: Improved the order of the fields in the sysAdmin MBean form, fixed typos in a couple of labels and provided more explicit labels (there were 2 fields each called Context, Host, Port and Protocol)
   25800: Removed the loading of the command-*.js files that end up in Data Dictionary/Scripts. If they turn out to be required by something (we can't find any code reference to them anywhere) then they will need to be added back but to a different location.
   25802: ALF-6884 "TR25: Reload license file on live server via JMX operation on LicenseDescriptor mbean."
   25804: Agenda View polishing: Style tweaks, removed refresh jump, added "Today" button (currently uses page refresh), new Sketch icon, etc.
   25805: Fix up license admin component after previous checkin
   25806: Update the new user email template acp to have localised descriptions for the templates
   25808: ALF-6621 "Version History panel"
   - activitiy filed after new version upload
   - fixed bug where revert didn't work
   - components refresh inline instead of page reload
   - made alfresco-macros.lib.ftl work when "page" attribute isn't present
   25811: Update the site invite email templates to be localised and html. For new installs, you will get the html versions from the acp. For old installs, the text version will remain in DD, and you'll get (+ start using) the new html ones.
   (Change also pushes some freemarker model logic from the people invite into template service, so the site import can use it.)
   25812: For new installs, don't bootstrap load the old invite-email.ftl, as we now get the new html ones from an acp patch that always runs
   25813: Merged V3.4-BUG-FIX to V3.4-TEAM (3.4.1 changes)
      24884: adding back runBare over-ride - test was deadlocking
      24894: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.4-BUG-FIX:
         24892: Fix ALF-6729: Corrected build paths for WQS following upgrade of commons-pool library
      24901: Fix ALF-6590: Requesting details of many assets using a GET request was causing Tomcat to close the socket connection. Changed so that we use a POST for this request.
      24905: Merged V3.3 to V3.4-BUG-FIX
          24904: Fixes ALF-5964: Installer height too small RHEL (records only)
      24928: Merged V3.3 to V3.4-BUG-FIX
         24927: Fixed ALF-5025 (ALF-6206): Support background processing of archiving
             - Added property: xam.archive.forceBackgroundStoreMove=false
      24930: Merged V3.3 to V3.4-BUG-FIX
         24929: Merged DEV/DAVEW/SAP to V3.3
            24925: ALF-6667: Fixed possible deadlock where index merger is never rescheduled under heavy load
      24941: Merged BRANCHES/DEV/BRIAN/wqs-caching to BRANCHES/DEV/V3.4-BUG-FIX:
         24613: WQS: Added caching layer for asset collections. Improves rendering time of homepage by 23% at steady state.
      24944: ALF-6662 - Transfer/replication servers need to be compatible versions
   25814: Convert the activities email templates patch/bootstrap from a single xml + classpath ftl, to an acp containing localised html versions following the new pattern
   25815: Merged V3.4 to V3.4-TEAM (RECORD ONLY)
      24946: Merged V3.4-BUG-FIX to V3.4 (RECORD ONLY)
         24752: Merged V3.4 to V3.4-BUG-FIX
            24751: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY)
               Restored V3.3-BUG-FIX mergeinfo, somehow truncated in revision 24274
         24757: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24756: Fix for ALF-6269: WebForm (Edit Web Content Wizard) ERROR on Alfresco Community Edition 3.4.b and 3.4.c
         24771: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24767: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
               24765: ALF-6547: fix intermittent test failure (AssetServiceImplTest renameFile/renameFolder) - fallout from ALF-1948
         24802: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24801: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection"
                - do failed audits in a separate thread (from a thread pool)
         24822: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24821: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection"
               - fix up unit tests
         24838: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24828: Merged BRANCHES/DEV/BELARUS/V3.4-2011_01_13 to BRANCHES/V3.4:
                24824: ALF-6361: web-client-config-custom.xml doesn't work in /alfresco/tomcat/shared/classes/alfresco/extension
         24857: Merged V3.4 to V3.4-BUG-FIX
            24853: Merged V3.3 to V3.4 
               24852: Fixed ALF-6573 "Incorrect name of subgroups on "Groups" page"
         24858: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24750: Limit installer builds to 2 threads
         24874: Merged V3.4 to V3.4-BUG-FIX
      24948: Merged V3.4-BUG-FIX to V3.4
         24718: Merged V3.3 to V3.4-BUG-FIX
            24717: Fix ALF-5555: It is impossible to edit review date from record's details page
         24719: Fix for ALF-6106: Error on Check In operation with % symbol (SPP)
         24733: Better fix for ALF-6106: Error on Check In operation with % symbol
         24734: Fix for ALF-6089: Incorrect order of fields at 'Create Series', 'Create Category' and 'Create Folder' forms
            The name, title and description fields are now placed in their own group on the server, all other non custom rm fields are put in an 'other' group, the client side config then declares a set for each group and orders them appropriately.
         24753: Merged V3.3-BUG-FIX to V3.4-BUG-FIX
            23870: Merge Dev to V3.3_BUG_FIX
               ALF-4243: F5 load-balancer sending regular HTTP requests to Alfresco server causing Faces Servlet to throw java.lang.NullPointerException (MyFaces upgrade to from 1.1.5 to 1.1.7)
            23897: Additional fixes and tweaks since introduction of MyFaces 1.1.7 library.
            23919: More JSF component id related fixes.
            23945: More MyFaces1.1.7 JSF page fix ups
            23959: Another MyFaces 1.1.7 dup id issue fixed.
            24008: ALF-4243
               - Upgraded MyFaces from 1.1.7 to 1.1.8 to fix a bug seen in 1.1.7
               - Added handling for the fact that valuebound properties that result in null now cause an exception where-as they were perfectly valid in 1.1.5.
            24419: Merge from V3.3 to V3.3-BUG-FIX
               r.24418 Fix for ALF-6075. Running out of /tmp space on the server is causing uploads to fail.
         24768: Fixes ALF-6295: Allows MySQL to not be installed via unattended installer invocation
         24779: Merge V3.3 to V3.4-BUG-FIX
            24497 : ALF-3092 - deployment service - catch Throwable from Begin.
            24684 : Merge DEV/BELARUS/V3.3-BUG-FIX-2010_10_04 to V3.3
               23498 : ALF-5498 In Windows XP, placing a Folder with a Name that already Exists Removes all Content of the Existing Folder
            24749 :  ALF-6174 - Transfer Service fails with double peer assoc custom content type
            24766 : ALF-5603 - It is impossible to assign workflow from workflow console to non-admin user
         24812: Fix ALF-6316: A new "spoof" multivalue text property (cm:tagScopeSummary) is now made available for TagScope nodes when accessed via the getProperty or getProperties operations on the standard node service. The values of this property take the form "<tagname>=<tagcount>". A new interceptor has been added to the node service to do this (TagScopePropertyMethodInterceptor). WQS has been tweaked to make use of this new property, and the now defunct behaviour has been removed.
         24820: Work in progress refactoring transaction handling of transfer unit tests.
         24834: ALF-6468 - Update the scheduled actions folder bootstrap to use localisable names and descriptions, following the normal pattern
         24836: Added system property 'system.cache.disableImmutableSharedCaches' (false by default)
            - Equivalent to disabling Hibernate L2 cache for *immutable* entities
            - Allows distinction between mutable and immutable cache entries
         24850: Fix ALF-6562: Moved property that is used to label the WQS dashlet on the "configure site dashboard" page out of the Slingshot project and into the WQS Share Module project. Corrected its value to "Web Quick Start" rather than "WCM Quick Start".
         24860: ALF-6673 - bootstrap folders and rename
         24870: Removed svn:mergeinfo from root
         24873: Merged V3.3 to V3.4-BUG-FIX (RECORD ONLY)
            21789: ALF-4333: Fix
               - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter).
               - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted".
               - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above.
               - Added new tests for deletion cases.
            23259: Merged HEAD to V3.3
               23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share
            23346: Brought WebQS module in (including build process but not installer elements yet)
            23371: "Simply" added wcmqs to installer
            23391: ALF-5367: Copy dlls into tomcat/bin as appropriate.
            23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines)
               23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations
            23515: Merged PATCHES/V3.2.0 to V3.3
               23514: ALF-5554: Merged HEAD to V3.2.0
                  23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on
                  23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo
            23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552)
               23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
            23564: ALF-5600: Merged V3.4 to V3.3
               23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet
                  Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown)
            23586: MERGED V3.4 to V3.3
               22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused""
               23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel]
               23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. 
                  Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call)
               23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events.
            23630: Backport of installer
            23631: Added 64-bit & deployment installers
            23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly
            23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties
            23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated
            23709: ALF-5699: Fix NPE in ManifestIntegrationTest
            23734: Merged V3.4 to V3.3
               23731: Fixes for ALF-3098 and ALF-3097
                  - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page
                  - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager
            23747: ALF-5696: Merged V3.4 to V3.3
               23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null"
            23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client."
            23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails
            23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33
               22750: ALF-4846: Update rules are firing on inbound actions 
            23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750)
            23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet"
               - Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions)
            24132: Disable intermittent failing unit test
            24148: ALF-6007: Merged HEAD to V3.3
               23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs)
            24263: Merged from V3.3-BUG-FIX to V3.3
            24264: V3.3-BUG-FIX to V3.3
               24262: Stress test code for ALF-5025: Support background processing of archiving
            24287: Added missing import
            24336: Merged V3.4 to V3.3
               23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent
            24353: Merged V3.4 to V3.3
               24352: Fix SQL fallout from ALF-6078
            24510: Merged V3.4 to V3.3
               21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts
               21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes.
            24526: Merged V3.4 to V3.3
               24402: Fix for performance degredation related to ALF-3823. 
                  RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library. 
                  Switched code to use the Java Regex libraries to improve performance and reduce memory usage.
            24587: Merged V3.4 to V3.3
               24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI
            24604: Merged V3.4 to V3.3 
               24602: Build fix for RM permission model loading - collateral damage for R 24564
            24774: Merged BRANCHES/V3.4 to BRANCHES/V3.3:
               23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value
            24813: Merged BRANCHES/V3.4 to BRANCHES/V3.3:
               24750: Limit installer builds to 2 threads
         24880: Merged V3.3 to V3.4-BUG-FIX
            24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge)
            24465: Merge V3.3 to V3.4 (RECORD ONLY)
               24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge)
            24493: Fix for Mac OS X CIFS logon problem, change UID to start at one as zero has special meaning, plus other minor fixes. JLAN-112.
            24569: Fix for ALF-5333: Webdav - Online editing of files in a folder with German umlauts does not report correct characters
            24611: Fix broken build due to merge #fail (r24460 / ALF-4015)
            24668: ALF-4557 - Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size
            24707: Fix for handling of null first/last name in wiki page list
            24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings)
            24794: Fix for ALF-4984 - Outdated custom-slingshot-application-context.xml.sample file for share
            24798: Fix for ALF-5806: Lucene query does not return expected result.
               - Alfresco FTS now supports the prefixes ~ and = for phrase queries
            24814: Build fix after r24798: Fix for ALF-5806: Lucene query does not return expected result.
            24823: Synchronization improvements to RemoteClient and http proxy hosts
            24825: Fixed #3 of ALF-6308 "Share data issues"
               - Share falls back to use "html uploader" (in all browsers except IE) when "JSESSIONID" cookie is unreachable from javascript (like when "HttpOnly cookies" is activated on the server.
            24835: Fixed ALF-5484: Check-in does not update association
               - Copy code when copying over an existing target node was NOT processing associations
               - Fallout from refactor and subsequent fixes related to ALF-958 (Target associations aren't copied)
               - Some commented-out unit tests reintroduced
            24842: Fix for ALF-6308 item #4 - validate the redirect URL to ensure it is a relative url
            24845: Merged DEV/DAVEW/SAP to V3.3
               23874: ALF-5822: Correct Lucene throttling mechanism to prevent build up of excessive committed deltas
                  - Also correct BatchProcessor's mechanism for single-threading batches with cross dependencies
                  - Single-threaded batches must be sequenced in order
               23876: ALF-5822: Default lucene.indexer.mergerTargetOverlaysBlockingFactor to 2 for better write performance under load
               24022: ALF-5822: Refinement of fix
                  - Don't block a thread that has already entered the prepare phase with another indexer (e.g. a cross-store commit). Otherwise it could block indefinitely and never enter the commit phase
                  - Also added extra debug diagnostics and handle all Throwables on failure
               24023: ALF-5822: Minor correction to debug log message
               24421: ALF-6134: Do not export org.hibernate.jmx.StatisticsService through JMX to avoid excessive blocking under load
               24422: ALF-6135: Remove lock contention from concurrent Lucene searches
                  - Added a RW Lock and Thread local-based solution to org.apache.lucene.store.FSDirectory.FSIndexInput.readInternal() to avoid contention during multiple parallel Lucene searches. This is already recognized as a bottleneck by the Lucene developers, who offer NIOFSDirectory as an alternative, which unfortunately doesn't work on Windows.
                  - Added RW lock to org.apache.lucene.index.TermInfosReader.ensureIndexIsRead()
                  - Threads no longer hanging in lucene searches during load tests. Woohoo!
               24423: ALF-6136: Don't call through to org.apache.log4j.NDC unless debug is enabled as it's heavily synchronized. Also avoid dynamic method invocation by using a delegate.
               24426: ALF-6138 (SURF - PARTIAL): 'Warm' the java.beans.Introspector cache for key Freemarker accessible bean classes on loading in static initializers
               24428: ALF-6139 (SURF - PARTIAL): First log in to Share is expensive due to 'lazy' dashboard creation and excessive synchronization
                  - Added AVMRemoteStore.createDocuments() for creating multiple XML documents at once, all embedded within the same master XML document in the request body 
                  - Added corresponding saveDocuments() methods to Store, RemoteStore, Model, ModelObjectManager and ModelObjectPersister on the Surf side 
                  - Used this in PresetsManager 
                  - Removed excessive synchronization from StoreModelObjectPersister 
               24429: ALF-6140 (SURF - PARTIAL): Surf tweaks to allow concurrent execution of web scripts
                  - Use StrongCacheStorage instead of MruCacheStorage in RepositoryTemplateProcessor to avoid use of a synchronized cache
                  - Tweak cache sizes in FreeMarkerProcessor
                  - Use thread local object wrapper delegates in QNameAwareObjectWrapper and PresentationTemplateProcessor to work around synchronization in DefaultObjectWrapper
                  - Swap in the same object wrapper to WrappingTemplateModel
                  - Use a concurrent HashMap in ModelObjectCache and ModelHelper and remove excessive synchronization
                  - Use RW locks rather than synchronized blocks in AbstractWebScript
               24431: ALF-6141: Improvements to IBatis DAO performance under load
                  - Use lazyLoadingEnabled="false", enhancementEnabled="false" to avoid unnecessary blocking and generation of CGI proxies in IBATIS DAOs
                  - Use useTransactionAwareDataSource="false" to prevent Spring from agressively unwrapping DBCP connections and bypassing the prepared statement cache
               24432: ALF-6142: Remove dependency between RepositoryAuthenticationDAO and Lucene
                  - Reworked RepositoryAuthenticationDAO to use a node service lookup by child association QName
                  - This required adding a patch to 'upgrade' the qnames of existing authentication nodes, which previously all had the same QName
               24433: ALF-6143: Remove net.sf.ehcache.use.classic.lru setting from EhCacheManagerFactoryBean and InternalEhCacheManagerFactoryBean to prevent serialization of accesses to shared caches by multiple executing threads
               24434: ALF-6144:  DirtySessionMethodInterceptor was causing contention between multiple threads calling the same DAO.
                  - Unfortunately method.getAnnotation() is a synchronized call, and thus causes concurrent calls to the same method to contended with each other. 
                  - Added a non-blocking cache so that DAOs can be accessed in multiple threads without contending. 
               24435: ALF-6145: Use RW Locks in Subsystem Framework
                  - The operations relied on by the dynamic proxies wrapping subsystems were synchronized and thus caused contention when multiple threads were calling in to the same subsystem
                  - Replaced synchronized blocks with use of read write locks, thus allowing multiple concurrent readers
               24436: ALF-6146: Regulate PermissionModel accesses with RW locks, rather than synchronized blocks and an excessive number of concurrent hashmaps.
               24438: ALF-6136: Fix build classpath
               24439: ALF-6142: Fixed seeding of admin user password
               24444: ALF-6142: Fix unit test fallout
                  - InviteServiceTest needs a transaction
                  - RepositoryAuthenticationDao must listen for Person username changes and update authentication node qname accordingly
                  - Correction to MT handling in RepositoryAuthenticationDao
                  - Repository Authentication Component must 'normalize' the username before passing it through the DAO
               24445: ALF-6145: Correction to lock handling when propagating destroy() events
               24446: ALF-6142: Add new dependencies to unit test
               24448: ALF-6142: Further fix ups
               24461: ALF-6142: Fix unit test
               24664: ALF-6408: Prevent possible deadlock during reindexing
                  - waitForHeadOfQueue() now only called in beforeCommit() phase rather than afterCommit() to prevent deadlocking with Lucene throttler
                  - indexes are also flushed beforehand in beforeCommit() so that indexing work can still be parallelized
                  - also prevent potential deadlock caused by clearing of IndexInfo.thisThreadPreparing in a nested transaction
               24810: ALF-6653: Use read write lock in Hibernate ReadWriteCache to avoid needless contention on L2 cache reads
               24817: ALF-4725: Avoid excessive lock contention in dbcp by upgrading to 1.4
                  - also upgraded commons pool
               24818: ALF-6658: Remove synchronization from LockService - transaction local collections used anyway
               24844: ALF-6681: Don't let the PostLookup job stack up in multiple threads
                  - Now only executes in one thread at a time and skips scheduled slots where it is already running
            24864: Fix for ALF-5904: Explorer - Space model rights not duplicated when creating a space based on a template
               - copy service no longer uses hasPermission
               - added tests for permission copy scenarios with assorted rights
               - this fix assumed there is nothing special about templates - ie that they should always carry permissions and is the "default" copy behaviour to copy permissions if possible
            24865: ALF-6145: Fix failing unit test
            24878: ALF-6146: Correction to write lock around requiredPermissionsCache
         24881: Increment version revision
         24884: adding back runBare over-ride - test was deadlocking
         24894: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.4-BUG-FIX:
            24892: Fix ALF-6729: Corrected build paths for WQS following upgrade of commons-pool library
         24898: Fixed merge issue in FixUserQNamesPatch
         24901: Fix ALF-6590: Requesting details of many assets using a GET request was causing Tomcat to close the socket connection. Changed so that we use a POST for this request.
         24905: Merged V3.3 to V3.4-BUG-FIX
            24904: Fixes ALF-5964: Installer height too small RHEL (records only)
         24928: Merged V3.3 to V3.4-BUG-FIX
            24927: Fixed ALF-5025 (ALF-6206): Support background processing of archiving
               - Added property: xam.archive.forceBackgroundStoreMove=false
         24930: Merged V3.3 to V3.4-BUG-FIX
            24929: Merged DEV/DAVEW/SAP to V3.3
               24925: ALF-6667: Fixed possible deadlock where index merger is never rescheduled under heavy load
         24941: Merged BRANCHES/DEV/BRIAN/wqs-caching to BRANCHES/DEV/V3.4-BUG-FIX:
            24613: WQS: Added caching layer for asset collections. Improves rendering time of homepage by 23% at steady state.
         24944: ALF-6662 - Transfer/replication servers need to be compatible versions
   25816: Removed unused config files; superceded by subsystem configuration
   25817: Tweak how the html notification/invite template ACPs are patched/bootstrapped to better fit the pre-existing pattern
   25819: ALF-7230. Fixed the document link sent out in the notification email.
   This document link is now a Share link and requires the admin to have configured SysAdminParams with server config data such as port number etc.
   Added the SysAdminParams bean to the ServiceRegistry
   Added a helper method to TemplateNode to get the Share URL for a (document) node.
   Updated the email templates within the acp to use the helper method in TemplateNode.
   25820: Merged V3.4 to V3.4-TEAM
      24885: Fix ALF-6694: V3.4.0 schema inconsistencies
         - ALF-6712: DB2: alf_authority missing index 'authority' during upgrade
         - ALF-6714: ALL: alf_prop_unique_ctx missing FK index on upgrade from 3.3 and 3.2
      24889: Disabled intermittently failing test (ALF-6700) until it can be made more reliable.
      24951: Merged DEV/DAVEW/SAP to V3.4
         24950: ALF-6698: Allow clearBatchSize and updateBatchSize properties of userUsageTrackingComponent to be controlled through system.usages.clearBatchSize and system.usages.updateBatchSize global properties
      24966: Fixed ALF-6363: Transaction status incorrect during afterCommit phase
         - Covered by unit tests
         - afterCommit or afterRollback will report "Not in transaction"
      24969: Fixed ALF-4372: JavaDocs don't match code for Index Recovery Modes (VALIDATE)
      24970: WQS: Fixed web publishing transfer service Spring definition (hopefully permanently now) following change to TransferService requirements
      24974: Fix ALF-6813: WQS: Specifying the sort order in the query of a dynamic asset collection has no effect
      24978: WebDAV: minor debug logging fixes
         - fix WebDAVHelper logger name to be consistent (with rest of WebDAV and other filesys protocols)
         - log service call as info (separate from rest of debug)
      24983: Step 1 of ALF-3891: Policy beforeDeleteChildAssociation not fired on delete node
         - Clean up deprecated beforeCreateChildAssociation, which could only be used *after* the event
      24985: Attempt to fix ALF-6820: Slow CMIS unit tests on build box
      24994: Fixes: ALF-6815 - terminology change (also fixes encoding bug that was preventing files being loaded into translation memory)
      24995: ALF-6572 - WCM: virt svr - enable "lazyDeploy" by default
         - can be disabled (in server.xml)
      24997: correction/kludge of DescriptorServiceTest.
      25002: Fix up test.
      25029: Merged DEV to V3.4
         25009: ALF-5829: Cannot upload files to Records Management site using WebDav from Mac OS X
             - Configuration constant that maps User-Agent pattern to response status code was added to WebDAVMethod.
             - Method that determines response status for AccessDeniedExeption using ‘User-Agent’ header was added.
             - AccessDeniedException processing was changed to return appropriate status.
      25043: Merged DEV to V3.4
         25012: ALF-6758: Potential JGroups Locking issue requiring jgroups upgrade
         JGroups was upgraded to the latest available stable version 2.11.1 Final:
            - jar was upgraded;
            - sources were upgraded;
            - classpath of the ‘3rd Party’ project was upgraded;
            - AlfrescoJGroupsChannelFactory was upgraded according to extension in superclass 
      25061: Merged DEV to V3.4
         24920: ALF-1787: Slow performances when many workflow are opened
             1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
             2. Uint test for creating and testing neccessary items in DB.
         25014: ALF-1787: Slow performances when many workflow are opened
             1. HQL query for TaskInstance properties chache. 
         Also:
            - Moved back to query.list() - no difference with scroll
            - Checked query plan for batching queries and found no problems
            - Batch queries *have* to be limited in the IN clause
            - Although not using scrolling, there was a missing close statement
      25072: Reversed change 25043: Slow performances when many workflow are opened
      25094: Resolve ALF-6736: CMIS Web Services: getObjectByPath() should return an objectNotFound error if the given path doesn't exist
      25107: Resolve ALF-6754: CMIS nameConstraintViolation errors are not returned to client
      25122: Merged HEAD to BRANCHES/V3.4:
         25115: Fixes: ALF-6336 - resolved incorrectly translated date formatting strings.
      25144: ALF-6841 - IMAP Sync Errors
      25148: ALF-6991: Connection pool causes poor performance in some test suites
         - Added explicit 'forceMultipleResultSetSupport=false' in case someone wants to change it.  
         - This is not a fix (or actually a change at all) just a documentation of the options available
      25149: Added transaction leak checks in security tests.
         - Just helpful for diagnosis when one test fails and brings the others down.
      25182: Merged PATCHES/V3.4.0 to V3.4
         25180: Merged DEV/TEMPORARY to PATCHES/V3.4.0
            25150: ALF-6918: Editing a Share document simultaneously using Share HTTP and Webdav breaks the document - working copy relationship.
               User can't unlock and edit original node that was checked out by him. 
               WebDAVMethod-> checkNode() was changed to return Http Status 423 if node has a working copy
         25181: Merged DEV/TEMPORARY to PATCHES/V3.4.0 (with corrections)
            25102: ALF-6894: Share IMAP - Modifier and date/time incorrect.
               ImapServiceImpl.checkForFlaggableAspect() method was modified to  disable "auditable" behavior before adding "flaggable" aspect and then enable it again.
      25193: Fix ALF-7039: Unable to specify target MIME type for renditions generated by the TemplateRenderingEngine
         The "mime-type" parameter is now exposed by any rendering engine that is derived from the BaseTemplateRenderingEngine
      25205: Merged V2.2 to V3.4
         25184: ALF-6914: Use RetryingTransactionHelper in WorkspaceClipboardItem
            - Also decoded the mysterious looping logic
      25214: Merged BRANCHES/DEV/BELARUS/V3.4-2011_01_13 to BRANCHES/V3.4:
         25045: ALF-6435: SPP doesn't work with MT users
      25216: Merged HEAD to BRANCHES/V3.4:
         25100: Fix for build issue Steve was encountering on new build boxes using Ant 1.8.x
      25219: Fix for ALF-6312: "Incorrect work of AWE functionality"
      25222: Merged BRANCHES/DEV/BELARUS/V3.3-2010_12_20 to BRANCHES/V3.4:
         24943: ALF-6103: Explorer - Version type not set by auto version
      25224: Fixed ALF-6992: PersonUsagePatch is sequenced incorrectly and is too slow
         - Added direct SQL update for cm:sizeCurrent (adds a type NULL property just like the Java patch did)
         - Removed the Java patch; ensured that new patch has the old as an 'alternative' and that the old patch is now a NoOp.
         - Tested with 50K users upgrading from 2.1
         - Can be backported safely to 3.2 and later.
         - Will provide instructions in the JIRA for working around.
      25225:ALF-6992: PersonUsagePatch
         - Fixed alf_applied_patch entry
      25229: Fix for ALF-6661: Fixed issue with navigation handling in JSF client, although seen via WebDAV in the bug description, it's actually the same for any inline editing.
      25237: Fix for ALF-6463: Collaborator and Editor cannot rename items via WebDav
      25244: Fix for ALF-6858: Uninitialized FormUI options parameter causes UI to be unusable
      25245: A new schema version range for 3.4.1
      25246: Merged BRANCHES/DEV/BELARUS/V3.4-2011_01_13 to BRANCHES/V3.4:
         25226: ALF-6348: Edit the event to reccurent and backward doesn't work
      25253: ALF-7059: Excessive webscript loading times in v3.3 and v3.4
         - Corrected escaping of Lucene document searches in RepoStore
         - The '-' character was getting interpreted as an operator when searching for package-desc.xml
      25256: ALF-5143: Eliminate use of non-I18N friendly FileWriter
      25258: Undid fix for ALF-6992 revs 25224 and 25225
      25259: Fixed ALF-6992: PersonUsagePatch is sequenced incorrectly and is too slow
         - Fixes ALF-6954, too: CLONE - Attempt to login into Alfresco fails for previously created users ...
         - Follows previous fix removal
         - Moved SQL from bootstrap to patch execution, but still do a mass update
         - Ensure that QNames are present prior to SQL execution
         - 'patch.authorityDefaultZonesPatch' depends on 'patch.personUsagePatch'
      25261: Merged DEV to V3.4
         25160: ALF-1787: Slow performances when many workflow are opened
             1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
             2. Uint test for creating and testing neccessary items in DB.
             3. HQL query for TaskInstance properties chache.
             4. HQL query for ContextInstance variables chache.
      25270: Fix for ALF-6271. ThumbnailRegistry loading definitions without transaction.
      25275: Merged DEV to V3.4
         25243: ALF-6583: when a LDAP admin removes its own account, account cannot be useed anymore and cannot be recreated
             - Full path to node calculating logic was extracted from ‘org.alfresco.filesys.repo.NodeMonitor.beforeDeleteNode()’ policy handler:
             - ‘NodeMonitor’ performs lookup operations as 'System' user
         25251: ALF-6583: when a LDAP admin removes its own account, account cannot be useed anymore and cannot be recreated
             - Additional persons’ cache controlling was added:
                - currently, ‘org.alfresco.repo.security.person.PersonServiceImpl.getPersonOrNull()’ checks all ‘User Home’ NodeRefs before using;
                - all inexistent NodeRefs will be removed from the cache 
      25281: Attempt to prevent build hang in ChainingUserRegistrySynchronizer
      25287: Merged DEV/TEMPORARY to V3.4 (with correction)
         25284: ALF-5596: Alfresco WebDAV does not work when repository is in read only mode.
      25295: Merged DEV/DAVEW/SAP to V3.4
         25207: ALF-6856: Avoid checkout failures under heavy load
            - Stop absorbing all exceptions in checkin / checkout / cancel-checkout
            - Propagate object wrapping code, message and cause instead
         25208: ALF-7062: Use a shared cache in RepositoryAuthenticationDao
         25209: ALF-7063: Use nodeService.exists() instead of a Lucene search in Search.findNode()
         25210: ALF-7064: Use caching plus a read write lock to avoid contention in SubsystemChainingAuthenticationService under load
         25211: ALF-7065: Use cached authorityService.getContainingAuthorities() method to improve performance of SiteServiceImpl.getPermissionGroups()
         25220: ALF-7062: MT fix
         25221: ALF-7062: Fix AuthenticationTest
         25223: ALF-7065: Refinement to use of cached authorities in SiteServiceImpl.getPermissionGroups() that preserves current 'direct memberships take precedence' semantics.
            - First fetch cached recursive group memberships. If there are zero or one, they can be returned immediately.
            - Otherwise, fetch immediate group memberships and work it out from there.
         25230: Extend ehcache cluster sample with socketTimeoutMillis=10000. Increase timeout from its 1 second default to avoid lots of RMI and cache integrity errors under load.
      25297: Fixed merge issue in 25295
      25302: ALF-6067: Unable to run read-only server without error
        - The latest error could not be reproduced
        - Added double-check to bypass audit if the system is in read-only mode (TransactionService.getAllowWrite())
      25306: ALF-5596: Merged DEV/BM to V3.4
         24726: BM - tweak WebDAV propfind (to use read-only txn)
      25326: Fixes for DB coverage: ALF-1787: Slow performances when many workflow are opened
         - Refactored query to use neat JOIN syntax
         - Added back batch size limiting to prevent Oracle blow-outs
         - Added in parameters to cover boolean query conditions
      25334: Added missing quotes in invitation service properties file
      25336: Merged V3.3 to V3.4:
         - 24918: ALF-6496: Browsing large File Plan is slow			
         - 24940: - Fix up issue with over enthusiastic caching of capability results.
              - Rename troublesome capability test so as not to hold up the build.  				
         - 24947: Fix-up to capabilities test.
         - 24973: Unit test fixes
         - 25046: Build fixes
         - 25080: RM: Fix transaction cache key
         - 25260: ALF-7000: RM: Cuttoff action for folder is missing when record is frozen
      25344: Updated capability tests.  More to come.
      25370: Fix for ALF-3339 - Modifying the properties of a link on a Folder does not show up after pressing the OK button but after pressing the 'close' button
      25374: Fix for ALF-6691 - Incorrect behavior of RSS feed for Wiki. Also fixes other minor RSS feed validation issues (pubdate format).
      25389: RM: Build fixes
      25414: Fix for ALF-3202: ALL field not fully implemented in LuceneQueryParser for wildcards, prefixes, and fuzzy
        - all current fields behave sensibly or throw unsupported
      25424: Fix for ALF-6576 - Search by tags shows not empty results on the site which has no content
      25467: Resolve ALF-7074: CMIS web services do not appear to allow ticket authentication
      25508: Fix for ALF-7110 - JSF custom component Form submit value encoding
      25538: ALF-6497: Updates to disposition schedules in progress do no complete with large record sets
         - Updates to records under the control of an edited disposition schedule is now performed in the background
         - A quartz job manages the record updates
         - UI updates to show whether there is a unpublished update to the disposition action pending 
      25539: RM: Ensure not "all" behaviours are switched off when processing disposition action defintions updates.
         - rm search information is now being populated and shown in the Ui correctly post publish
         - see ALF-6497
      25545: Merged V3.3 to V3.4
         ALF-7196: Records only
      25573: Deleted : /alfresco/BRANCHES/V3.4/root/modules/dod-5015/source/java/org/alfresco/module/org_alfresco_module_dod5015/model/FilePlanComponentAspectTest.java
      25603: Updated Postrgresql install switch
      25608: Fix Eclipse classpath after Postgres driver move
      25620: Fix for escalated issue ALF-7218: Advanced Search in Share breaks with custom type which contains underscores in type name
      25622: Merged BRANCHES/DEV/BELARUS/V3.4-2010_12_14 to BRANCHES/V3.4:
         24647: ALF-6307: Compliance for Third Party jars with Source Modified
      25623: ALF-6309: Changes to notice.txt and addition of license files
      25627: Fixes ALF-7222: Updated linux installer window height (with taller image to hide additonal background)
      25633: Fix intermittent unit test failure - retrying txn in RecordsManagementAuditServiceImplTest
      25637: Merged DEV/TEMPORARY to V3.4
         25215: ALF-6696 : Upgrade from 2.1.7 to 3.3.4 failing Due to "out of memory"  
            All large db scripts for all supported dialects was modified to follow batching approach.
         25325: ALF-6696 : Upgrade from 2.1.7 to 3.3.4 failing Due to "out of memory"
            1. Upgrade scripts for all supported dialects was corrected to follow mysql style after David's review of batching porting work.
         25398: ALF-6696 : Upgrade from 2.1.7 to 3.3.4 failing Due to "out of memory"
            Some errors was corrected in upgrade scripts after David's review.
      25643: Initial commit of reworked Japanese language pack
      25669: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         25665: Spanish Language Pack update from Gloria
      25671: Updated installer with simple Easy install.  Fixed binaries inclusion.
      25684: Fixes: ALF-7102 - minor (consistent) typo in i18n string.
      25692: ALF-7293 - Handle error condition of unsupported RSS XML format (RDF in this case)
      25707: ALF-6993 Fixed AlfrescoTimer so that it no longer ends the task if the Timer is set to repeat.
      25715: Fix intermittent failing unit test by increasing time window
      25718: Merged PATCHES/V3.4.0 to V3.4
         25700: Fix for ALF-7059: Webscripts: Startup: webscript loading takes about 10 minutes to complete.
            - QNAME:simpleToken will go down an optimised route
      25720: Fix for ALF-7318: patch.calendarNamespaceUri fails as the TYPE field no longer supports prefix queries
         Part fix for ALF-6291: Inconsistencies in lucene search queries with wildcards and single letters.
      25721: Fixed ALF-7319.  Removed ';'.
      25734: Updated copyright to 2011
      25738: Fix to issue with groups display and wrong panel returned to after cancel group edit
      25773: Merged BRANCHES/DEV/BELARUS/V3.4-2011_02_16 to BRANCHES/V3.4:
         25747: ALF-6307 Compliance for Third Party jars with Source Modified
      25798: Merged PATCHES/V3.4.0 to V3.4
         25789: Merged DEV/TEMPORARY to PATCHES/V3.4.0
            25783: ALF-7079: concurrent access to share site using the Share web UI and webdav by two users break the copy.
               1. The WebDAV MOVE and DELETE methods were modified to properly handle the "MS Word shuffle" for working copies.
         25793: Merged DEV/TEMPORARY to PATCHES/V3.4.0
            25395: ALF-7079 : concurrent access to share site using the Share web UI and webdav by two users break the copy.
               UnlockMethod (webdav) was modified to correctly handle working copies.
      25803: Merged V3.3 to V3.4 (RECORD ONLY)
         25015: ALF-6749: Merged V3.4 to V3.3
            24601: Fix for ALF-6032: It's impossible to create meeting items
         25062: Merged V3.4 to V3.3
            25061: Merged DEV to V3.4
               24920: ALF-1787: Slow performances when many workflow are opened
                   1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
                   2. Uint test for creating and testing neccessary items in DB.
               25014: ALF-1787: Slow performances when many workflow are opened
                   1. HQL query for TaskInstance properties chache. 
               Also:
                  - Moved back to query.list() - no difference with scroll
                  - Checked query plan for batching queries and found no problems
                  - Batch queries *have* to be limited in the IN clause
                  - Although not using scrolling, there was a missing close statement
         25276: Merged V3.4 to V3.3
            25261: Merged DEV to V3.4
               25160: ALF-1787: Slow performances when many workflow are opened
                   1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
                   2. Uint test for creating and testing neccessary items in DB.
                   3. HQL query for TaskInstance properties chache.
                   4. HQL query for ContextInstance variables chache.
         25328: Merged V3.4 to V3.3
            25326: Fixes for DB coverage: ALF-1787: Slow performances when many workflow are opened
                - Refactored query to use neat JOIN syntax
                - Added back batch size limiting to prevent Oracle blow-outs
                - Added in parameters to cover boolean query conditions
         25373: Merged HEAD to V3.3
            25100: Fix for build issue Steve was encountering on new build boxes using Ant 1.8.x
      25807: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4:
         25785: Add the WQS client API to the "generate-javadoc" build target
         25792: Fix ALF-7345: WQS: Unable to place a WQS on the root context of a web container easily. This fix enables the web context of a WQS website to be set to "/" to indicate that it lives at the root of the URI namespace of the web container.
      25809: Merged V3.3 to V3.4
         24899: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.3
            24898: Fixed merge issue in FixUserQNamesPatch
         24913: Merged BRANCHES/DEV/BELARUS/V3.3-2010_12_20 to BRANCHES/V3.3:
            24890: ALF-837 Firefox: Incorrect behaviour of Insert/Edit image option on creating content based on web form
         24962: (RECORD ONLY) Merged PATCHES/V3.3.3 to V3.3
            24959: ALF-6780: Merged V3.4 to PATCHES/V3.3.3
               23385: Fix for ALF-5166: After restore of indexes - AUTO hangs
                  - bulk deletes are now handled as such during index tracking and rebuild (as they are normally)
         25011: Attempt to resolve latest build deadlock: Specify inputstring="" in junit invocations in order to work around Ant bug https://issues.apache.org/bugzilla/show_bug.cgi?id=37887
         25012: Reverse previous checkin.
         25033: ALF-6535: Changes to enable session sticky sessions for SPP
         25034: Merged DEV/TEMPORARY to V3.3
            25026: ALF-6763 : Malformed web.xml prevents 3.3.5 340 JBoss deployment, org.apache.myfaces.ERROR_HANDLING param should be replaced
               1. Web.xml was modified for web-client to allow bootstrap alfresco on Jboss EAP 5.1.0.
         25060: (RECORD ONLY) ALF-6114: Rules for updated items are triggered before users commit any changes.
         25063: Merged DEV/TEMPORARY to V3.3
            25059: ALF-608 Errors when uploading content via CIFS result in zero byte files
               Closing file operations wrapped by transaction in ContentDiskDriver.
               Catching IOException in NTProtocolHandler.procCloseFile() was changed to catching Throwable to avoid delay.
         25067: For for ALF-6807: TinyMCE: This is a follow up of: http://issues.alfresco.com/jira/browse/ALF-5420 (escalation)
         25177: ALF-6855: Adding versionable aspect as rule in share site causes errors
         25186: Merged PATCHES/V3.3.3 to V3.3
            25065: Fix for ALF-6780 Full re index seems to not ends up under certain circumstances.
               - A full rebuild only creates nodes
               - Fixed issue repeating all previous deletes already processed in the transaction (for deletes and updates to nodes)  with every delete/update in the transaction
               - Closed TermDocs enumerations
         25372: ALF-5933: Updated mysql collate encoding
         25456: Fix for ALF-7078: CLONE -Impossible to reject invitation due to script error
         25478: Fix for ALF-6756 - JSON delete should not pass body for request
         25498: (RECORD ONLY) ALF-5964: Updated installer window height for linux
         25533: ALF-6946: Correction to WAS libraries.xml
         25558: (RECORD ONLY) Fixes ALF-6268
         25560: Fixed ALF-7210: User workflow tasks query fails on RHEL
            - Case-sensitivity in the table aliases cause failure on unix
            - Must be 'processInstance' not 'processinstance'
            - Fallout from ALF-1787: Slow performances when many workflow are opened
      25810: Merged V3.3 to V3.4 (RECORD ONLY)
         25070: Reversed revision 25062
   25822: First embryo of social items on doc details page.
   25823: ALF-7336 - License file to be loadable from configurable location
   25824: ALF-7333: TR24: IMAP, CIFS, WebDAV & FTP should not mount company & user home by default
    - Added global property 'protocols.rootPath' defaulting to protocols.rootPath=/${spaces.company_home.childname}
    - Included 'protocols.rootPath' in file-servers config and IMAP config
    - TODO: Get 'protocols.rootPath' into WebDAVServlet
   25825: Fixed Eclipse classpath which contained a reference to someone's Tomcat directory
    - To avoid having to update the classpath, create a project in Eclipse called "Enterprise Runner"
      and pull in the "Enterprise Repository" into that.  Then run tests in context of "Enterprise Runner".
      Additional jars and paths can be pulled in as required.
   25826: Merged V3.4 to V3.4-TEAM
      25301: (RECORD ONLY) Merged V3.4-TEAM to V3.4
         25189: Expose getAllowWrite on the TransactionService API
      25821: ALF-5841 Applied fix to queryTasks() to stop the process definition hibernate query exceeding the limit of 1000 arguments.
   25828: New i18n labels for social interactions
   25830: Working "likes" added to document header on doc details page, using the Alfresco.Like widget found in share.js
   25831: More work in progress ALF-6593: TR04: Update dashlets to provide consistent look & feel, include thumbnails, help text, action links where applicable
   25832: Remove placeholder text (unused)
   25833: Some improvements on the "likes" in share.js, such as calling it Alfresco.Like instead of Alfresco.Favourite...  :-)
   25835: Build fixes for RM related tests
   25836: Added "favourite" on doc details page's header suing Alfresco.Favourite foun din share.js ALF-6614 "Page redesign and refactor"
   25837: Update the new html templates - remove the share_or_team flag (switching to just being "Alfresco"), and rationalise on shareUrl rather than a mix of shareUrl and share_url
   Also tweaks how shareUrl is injected into the model
   25838: I have no idea why FormServiceImplTest is failing on the build server, it runs fine locally. In the interest of getting a successful build this weekend I'm disabling the failing checks until I have time to investigate the environment difference on the build server.
   25839: Fixes to siteURL macro and param reader following recent refactoring.
   25841: ALF-7358 - RTEAM 38: User count is not decremented when users are removed
   ALF-7378 - RTEAM 39: Excess users error is not accurate for an end-user
   25842: Removed deep permission checks in RepoUsageComponent
   25844: Url fix for "like activity" posted from doc details page ALF-6614 "Page redesign and refactor" activities
   25847: ALF-6614 "Page redesign and refactor" added missing peice "comments" in doc detail header
   25848: Update the InviteSenderTest to work with the new way of passing the template details+model to the MailActionExecutor, rather than rendering the text itself
   25856: Change the User CSV Upload webscript to handle the transaction itself. This means that if the transaction commit fails (eg user limit exceeded, custom person validation fails) then we get to send the client our own error message+status code. 
   (Previously the commit failure was trapped by RepositoryContainer, and so the webscript had no control over the error reporting process, which is required in this case to meet share UI needs)
   25858: When generating WebScriptExceptions from a resource bundle (instead of the more usual system properties), ensure that the underlying cause (if present) is included
   25864: Added back logging of subsystem start/stop.
   25865: Removed unused code and comments
   25871: General license fixes
    - Apply forced read-write to transactions
    - Heartbeat code synchronization around enable/disable
    - Fixed license test to check for heartbeat state correctly
   25872: Merged V3.4 to V3.4-TEAM
      25849: Fixed ALF-7379: PostgreSQL patch.migrateAttrAVMLocks error when upgrading to Enterprise 3.4
         - PostgreSQL doesn't accept column aliases without 'as'
         - Probably version-dependent
      25850: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         25843: Updated FR files received from Gloria 2011-02-25
         25845: Updated IT files received from Gloria 2011-02-25
         25846: Updated DE files received from Gloria 2011-02-25
      25859: Merged PATCHES/V3.4.0 to V3.4
         25857: ALF-7376: Detect concurrency problems in PutMethod
      25867: Fixes: ALF-5628 - Meeting Workspace Calendar Entry issue.
      25868: ALF-7274: Reinstate &characterEncoding=UTF-8 into default MySQL JDBC URL, using proper encoding of & for an XML file (&amp;)
   25882: License tests: Narrow down failures (doesn't fail locally) and also deal with logging problems
   25883: ALF-6593: TR04: Update dashlets to provide consistent look & feel, include thumbnails, help text, action links where applicable.
   New placeholder filetype icons @ 32x32.
   New avatar get URL (internal): /slingshot/profile/avatar/{username} or /slingshot/profile/avatar/{username}/thumbnail/{thumbnailname}
   Added "avatar32" thumbnail preset.
   25885: Remove reference to non-existent file. Add folder icons back into path on the details page.
   25886: Added new avatar photo placeholder icons from Linton
   25893: Fixed Legal and License url in About dialog
   25895: Fix for ALF-6622 "Comment component redesign and refactor"
   * show new comments component where required
   * comments in correct order 
   * displaying ok in 1024x768
   25897: Fix for ALF-6622 "Comment component redesign and refactor" part 2 (#svnuserfail)
   * show new comments component where required
   * comments in correct order 
   * displaying ok in 1024x768
   25907: Clean up redundant javadoc
   25909: Wrapped setup and tearDown work in retries
   25910: More ALF-7120: TR03: Test and integrate sample site into bootstrap process
    - Pulled everything into first-level patch
    - Removed build-time dependencies
    - Fixed authentication wrapping
    - Fixed I18N messages for patch
    - Note: The patch ID has changed, but this will not cause problems on re-application
   25912: Fixed test fallout from rev 25910 (ALF-7120: TR03: Test and integrate sample site into bootstrap process)
   25926: Even more ALF-7120: TR03: Test and integrate sample site into bootstrap process
   - Removed exclusions from build script for XML file no longer present
   - Fixed an re-enabled JavaScript test in SiteServiceImplTest that was disabled earlier
   25928: - Added form config for ActivitiesFeed MBean ready for addition to admin console
   - Made all boolean fields use a checkbox
   - Re-ordered Fileservers fields to tidy up form and fixed labels
   25937: Build fixes, updated counts for groups as there are now more groups in a default repo due to sample site being created.
   25940: Added Activities feed admin console component
   Fixed label reference in IMAP admin console component
   25955: Merged V3.4 to V3.4-TEAM
      25946: ALF-7191: Generate duplicate _en resource bundles, using location of _fr bundles as a guide for ALL bundles under alfresco and share WEB-INF/classes 
      25947: ALF-7191: Reverse accidentally committed changes to WebDAV in 25946!
      25954: ALF-7191 - Generate _en bundles for all message bundles for Explorer and Share - using known location of message bundles
   25959: Extra logging around ALF-7336: License file to be loadable from configurable location
   25962: Updated example JavaScript patch to include an example that starts a pooled review and approve workflow for all the members of the site the document being acted upon belongs to. The script has no effect if the document lives outside a site.
   25965: Fixes and tweaks from Alfresco Team UI review meeting
   25973: Fixed issue where some form field labels were not returned, was caused by a bean in the enterprise forms context file having a duplicated name.
   
   Also re-enabled the forms tests I disabled as these should now be fixed too.
   25977: More TR28: Prevent the IMAP 'Email Actions' folder from being created during bootstrap. The folder structure contains rules that point to the scripts we also no longer bootstrap. This folder is used for optional IMAP functionality which can be enabled by manually importing the ACPs if required.
   25982: Merged V3.4 to V3.4-TEAM
      25890: Fix for ALF-5796 - It's impossible to add tag in Japanese language (IE specific)
      25894: Fixed Legal and License url in About dialog
      25896: ALF-6476 -translation on Transfer Target configuration
      25899: First cut of French transfer properties.  Mostly English! but has 3 lines of French.
      25900: Fix for ALF-6916: More Deployment Reports action causes an error
      25916: Updated support URL in readme
      25925: Fix for ALF-6885: alfresco-enterprise-3.4.0.zip package has 2 issues with apply_amps.sh
      25936: ALF-6469 - transfer folders internationalized
      25949: Fixes: ALF-6521 and ALF-6493 (Site discussion's handling of tags with special characters in them)
      25950: Fixes: ALF-6489 - encodes the content's name to make it safe for a URL.
      25951: Fixes: ALF-6487 Adjusts styling for rename panel
      25956: Allow a bit of leeway with audit timing during delete tests
      25957: Fixed ALF-7341: Upload performance degradation when uploading contents to folders with content rules applied.
         - Action executions were being recorded by the ActionTrackingService for all actions
         - Post-commit updates of the action node was reducing performance
         - Added 'trackStatus' to ActionExecuter, ActionDefinition and Action
         - Default 'trackStatus' is false; exceptions: 'replicationActionExecutor' and 'commit-transfer'
         - Adjusted tests accordingly
         - General cleanup around modifications
      25964: ALF-5625 - When viewing properties in version history hitting close results in loop
      25970: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4:
         25967: Fix ALF-7440: WQS: commons-pool library has been upgraded, but WQS build properties have not been changed accordingly
      25974: Reverted rev 25964 - as fix is scheduled for 3.4.2
      25979: Disabling intermittent failing unit test. ALF-7443 logged.
   25989: ALF-7457: Update to Team UI following 01/03/2011 review
   25990: Fix initial load of my tasks dashlet. Dashlet pagination now hidden if dashlet empty.
   25991: Agenda View: fixes minor bugs & attempts to slightly improve usability of Event Info box.
   25993: Fix for ALF-7444: RTEAM 41: ActivitiesFeedNotifier fails to send emails (when built using exploded target)
   25997: License management debug logging
   25998: Temporary logging for license and heartbeat
   26008: Merged BRANCHES/V3.4/ to BRANCHES/V3.4-TEAM:
      25891: Fixes: ALF-7363 (updated JA translation)
      25901: Fixes: ALF-6847 (Italian Translation)
      25902: Fixes: ALF-6861 (incorrectly encoded German character)
      25904: Fixes: ALF-6755 (translation quoting error)
      25911: Fixes: ALF-6478 - French translation correction
      25915: Updates TinyMCE translation as requested in ALF-6486.
      25917: Fixes: ALF-6482, wrong word order in FR has been corrected.
      25913: Fixes: ALF-6334 and ALF-6477 (Profile Edit style issues - makes mark up consistent, clears floats to allow for foreign languages being a tad more verbose than English and adjusts padding to help input boxes line up.
      25919: Fixes: ALF-6655 updated to allow enough space for verbose languages (e.g. FR, ES)
      25941: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
           25939: Latest JA update from Translators, received: 2011-02-28
      25943: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
           25942: Language updates for property string changes and additions between 3.4.0 and 3.4.1
   26009: Fixes double byte comma issue in JA.
   26010: License loading: Further use of the license change callback
    - Added notification for license failures
    - Heartbeat uses callbacks
    - ALF-6884, ALF-6905, ALF-6888
   26015: Updated sample site, now contains images that can be distributed.
   26016: Temporarily disable failing test: runs locally
   26018: Final version of English HTML email templates.
   26025: Debug logging to test to trace during builds.
   26029: Team unit test fixes and analysis
    - Reintroduced UserUsageTrackingComponentTest with debug logging to aid trackability
    - Fixed at least one LicenseComponentTest (Trial license generation for forcing read-only mode)
    - Added further logging of failed licenses to aid tracability on build box
    - Removed temporary debug logging (build box debug logging working fine)
   26031: Fixed embedded license loading and logging
   26038: Updated Contents.acp of sample site, fixes the broken image link in the wiki's main page
   26041: Merged V3.4 to V3.4-TEAM
      26024: ALF-7466 - Links do not appear correctly in the management Console (RM)
      26033: Correct database cleaning behaviour of continuous build - dir.test.data was never set. dir.root was never getting cleaned.
         - dir.test.data replaced with dir.root
      26036: ALF-6403: Merged V3.4 to V3.4 (lost revision)
         25627: Fixes ALF-7222: Updated linux installer window height (with taller image to hide additional background)
      26039: Fix intermittent failures in InviteServiceTest.tearDown()
      26040: Fix intermittent failures in InviteServiceTest.setUp()
   26046: Test cleanup of license restrictions
   26047: Prevent real embedded license from being picked up during unit tests of embedded license
   26053: Added in loop to wait for asynchronous post-failure auditing (ALF-3055)
   26054: Separation of embedded license location for HeartbeatTest
   26055: Merged V3.4 to V3.4-TEAM
      26014: ALF-7087 - Cannot override webscript files in case of using jboss 5.1GA
      26043: Sync up run-junit-test with junit macros so that it can be used to run unit tests in an enterprise environment (e.g. DB2 / Oracle)
      26044: Possibly fix intermittent TransferServiceImplTest failures by using org.alfresco.repo.transaction.RetryingTransactionInterceptor
      26052: Do not wait indefinitely for a heartbeat in HeartBeatTest. A broken heartbeat would cause the build to hang forever!
   26062: ALF-7492 - MT support for new Team/Enterprise license info retrieval in web-tier.
   26064: Fixed ALF-7419: RTEAM 40: Duplicate warning and error messages when user limit reached
   26066: Fixed ALF-7489: Team - default outbound email settings need removing
    - Now: mail.host=smtp.example.com
    - Added this to build env. on bamboo and bamboo2: mail.host=smtp.alfresco.com
   26069: Removed unused remote-api bootstrap files
   26070: Use PropertyCheck to check for valid property values
   26071: Extra debugging during 'split person' processing
   26072: ALF-7333: TR24: IMAP, CIFS, WebDAV & FTP should not mount company & user home by default
    - WebDAV obeys 'protocols.rootPath'
      - Use dedicated bean to ingest properties so that Spring takes care of the placeholders
      - Servlet gets the bean instead of using web.xml config values
    - Added global property 'protocols.storeName' and injected it into protocol configurations
   26073: Follow-up on rev 26069: Removed unused remote-api bootstrap files
   26074: ALF-7468: Update to Team UI following 03/03/2011 review
   ALF-7474: Check supported mimetypes for new icon support
   26075: Latest dashlet help balloon and empty content text. Missing file from r26074. Consolidated Site and Repository DocLib renderers.
   26076: Fix to base style for Content I'm Editing dashlet
   26078: Fixed the "RM part" of ALF-7013 "Fix up refactored Document Details page and components for RM and WCMQS modules"
   26079: Merged V3.4-BUG-FIX to V3.4-TEAM
      26057: Fix for ALF-6691 - Incorrect behavior of RSS feed for Wiki. Resolves a number of niggly auth related issues with RSS feeds and auth.
      26060: Improvements to error 500 handling page for Share. Complete exception output as HTML comment for administrators and developers. Web-tier server errors now output to the console again also.
   26080: ALF-7358 - RTEAM 38: User count is not decremented when users are removed
    - Added listening during modification of user (enable/disable)
    - Use common warning and error logging: the same logging that is displayed to admin
    - Also fixed erroneous logging of person splitting when a user was changed (it was not actually doing anything)
   26083: JA file moved to reflect changes made while translation was being done.
   26085: Fixed ALF-7529 "No doclib action on details" - caused by double encoding of vtiServer property
   26086: ALF-6835 - Report license errors to all users and warnings+errors to admin on first login.
   26087: Final implementation of ALF-7230.
    - Changed ImapServiceImpl to look for localised siblings of the Imap Email templates. Using the normal FileFolderService method, email templates for IMAP clients will be selected based on server locale.
    - Added new email templates for locales: de, es, fr, it.
    - Changed existing default locale to use ACP for consistency.
   26090: Updated sample site, now includes a video file to highlight new video previewing capabilities
   26091: Fixed ALF-7013 "Fix up refactored Document Details page and components for RM and WCMQS modules" part 2 - WCMQS
   26092: Addition of patch for non-default locale templates for Imap Clients. (ALF-7230)
   Also stepped the db version number.
   26098: Minor updates to dashlet help text.
   26103: Fixed test after default config for email settings were changed.
   26105: ALF-7533: Drag and Drop no longer works into FF3.6 browser
   ALF-7532: Content Rule on RM site (other than Folder) creates 'GUID' folder in Share (fixed as part of general RM fixes)
   
   Also: RM and WCM QuickStart Document Library extensions patched to latest code. WCM QuickStart toolbar extension removed. Drag and Drop refactored to work in Repository Browser and WCM QuickStart; switched off for RM. English property files created when using Slingshot exploded target. Header conditions updated to use correct Community edition string.
   26106: Remove debug output.
   26108: Fix for ALF-7331. Thumbnails in Share do not change from initial generic filetype icon...
   The fix is to have StreamContent.java use the actual resource's modification timestamp for the Last-Modified header.
   It was using the mod-time of a newly created file, which held a copy of the classpath resource.
   This led to a race condition between putting a timestamp on the placeholder and putting a timestamp on the cm:thumbnail node.
   26113: Fix slingshot-exploded target - missed commit from yesterday.
   26114: Merged V3.4 to V3.4-TEAM
      26077: Upped LOGFILSIZ to avoid failures in unit tests with large transactions on DB2
      26084: Avoid intermittent test failures in AbstractTestFormRestApi by using retrying transactions
      26096: Correction to DB2 drop / create commands
      26097: Fixes: ALF-7102, typo in property string.
      26102: Attempt to avoid intermittent failures in TaggingServiceImplTest by upping wait time
      26109: Another go at executing the db2 creation statements synchronously through db2cmd
      26111: ALF-6764 - Copyright year on Share login page out of date
   26118: Made the JMXFormProcessorTest more resilient to changes in the email configuration.
   26122: Fix customize site page following refactoring in r26078. Added Data List page icon.
   26126: Merged V3.4-BUG-FIX to V3.4-TEAM
      26099: Resolve ALF-7539: Tomcat sessions are created unnecessarily when invoking CMIS web scripts from Web Quick Start
   26129: ALF-6929: RTEAM 21: activities feed notifier - add per user on/off flag
   26149: Removed old System.out
   26150: Fixed ALF-3856: Version History lost when Versionable Content renamed via CIFS
    - Added fileservers property: filesystem.renameShufflePattern=(.*\.tmp)|(.*\.wbk)|(.*\.bak)|(\\~.*)
    - Any rename that does not match the pattern on either the source or target names will not be shuffled
    - Requires retesting of use cases involving CIFS and MS Word.
   26151: ALF-6626 TR15: Email notification preferences
   Cleanup to related components
   26161: Fix full installer.
   26162: Updated calendar help with latest icons and styling to match.
   26168: Use new install builder 7.0.3
   26169: Localized installer.
   26173: Tweak to display of warnings/errors after login - reduced impact on server
   26200: Locate Postgres data within alf_data directory
   26209: Locate Postgres data within alf_data directory for Team
   26210: Set license path to include install dir, and set protocol root to Sites
   26215: The ContentTransformerRegistry and the ContentService used to only expose the 'best' transformer for a given (srcMime, targetMime, options). This check-in adds access to the full list of active transformers for any (srcMime, targetMime, options) to those two classes.
   As part of a subsequent fix for ALF-5084, the ThumbnailService will use this list to improve create-thumbnail retry behaviour for problem files.
   26227: Merged V3.4-BUG-FIX to V3.4-TEAM
      26226: Merged DEV/SWIFT to V3.4-BUG-FIX
         26225: 'renameShuffle' detection pattern needed extending and logic was slightly incorrect
                 - Fallout from fix for ALF-3856 detected by new unit tests
   26235: Merged V3.4 to V3.4-TEAM
      26233: Fixes ALF-6019: Ensure PostGres services deleted after installation cancel
   26264: ALF-7653 - sys-admin panel no longer editable
   26265: Merged V3.4-BUG-FIX to TEAM
      26263: Merged DEV/SWIFT to V3.4-BUG-FIX
         26262: Fixed regex patterns to cater for .properties file escapes (ALF-3856)
   26266: ALF-7651 - WebM and OGG Video have 'unknown' mimetype in Team
   26267: ALF-7578 - When importing from an ACP a node with the versioned aspect on it, have an initial version history created starting at the current version label.
   26268: ALF-7687 - Ability to use wild character in People search - Should add configuration to allow zero characters for all search in Team config.
   26272: ALF-7578 - Add unit test for versionable ACP import, and fix the default aspect includes now that we handle versionable
   26287: Fixes ALF-7439: Prevent check on alfrescowcm component
   26290: Fixes ALF-7439: Ensure that virtual server shortcuts don't get created for Team
   26294: Fixed @since tags and some minor coding standards fixes
   26316: Fix for ALF-5084, ALF-5644 and general thumbnail improvements in the area of failing thumbnails.
   
   This check in adds extra functionality to the create-thumbnail action in order to improve how Alfresco handles failing thumbnails.
   The requirements agreed between Services & Prod Mgt were
    - When thumbnails fail we should limit how often they are retried. So the system should remember when a thumbnail has failed for a node. 
    - The retries will be initiated in the same way they are now: by users navigating to a page that asks for the thumbnail (lazy creation), primarily doclib. 
    - Retries will occur at a throttled rate (all the below parameters to be configurable by sys admin, but not yet by JMX). 
    - Initially, retries will be limited to a maximum rate e.g. 1 per minute. 
    - These retries will be allowed up to a maximum count e.g. 2 failed attempts. 
    - After that count is reached, the content will be considered "difficult" and thumbnail creation should be retried at a much reduced maximum frequency e.g. once a week 
    - Retries of difficult content shall be enabled by default, but can be disabled.
   
   This check-in adds a new aspect and a type to the content model. These hold the thumbnail failure information.
   The create-thumbnail action now has a compensating action which is run when it fails.
     AddFailedThumbnailActionExecuter decorates the content node with failure information.
   create-thumbnail now has an action-condition, which means that it will only run if a node is "eligible" for a thumbnail creation attempt.
   Eligibility is controlled by some new properties and is configurable. Default behaviour is as described above.
   
   There should be no change in behaviour for most content nodes in Alfresco.
   However, for those documents which fail to produce doclib or webpreview thumbnails - and most especially those which consume 100% cpu for some time before failing - we expect to see the same behaviour initially on upload (cpu grind as Alfresco or a 3rd party library attempts to produce a thumbnail), but that as time passes, Alfresco should prevent thumbnail creation that will likely not succeed. This should save cpu on the repo server.
   
   And tests. Of course.
   26323: Upgraded login warning to WARN_ALL when user limit reached
    - This now matches the specification document
    - ALF-6832:TR25: License restriction reporting
   26326: Merged V3.4 to V3.4-TEAM
      26142: Merged PATCHES/V3.4.0 to V3.4
         25999: ALF-7377: Validate and reject partial WebDAV requests sometimes produced by NetDrive
      26143: Merged PATCHES/V3.4.0 to V3.4
         26005: Merged V3.4-BUG-FIX to PATCHES/V3.4.0
            26002: ALF-7282 Updated NodeListConverter so that it now implements the method revert(Object, ProcessDefinition)
      26158: Merged DEV/TEMPORARY to V3.4
         26154: ALF-7571: Create Web Project wizard - Step 3
            Superfluous “cellpadding” elements were removed. Missing space was added.
      26164: ALF-6885: Changed svn:eol-style from native to LF for all .sh scripts
      26178: Merged DEV/TEMPORARY to V3.4
         26172: ALF-7601: 3.4.1 SDK WebServiceSamples multiple problems
            Configuration properties for WebServiceSamples was moved to correct place.
            Dependency to SDK AlfrescoEmbedded was added to classpath. It is required for FileCopyUtils from Spring which is used in WebServiceSamples.
      26190: Reversed 26165 / 26161 - breaks installer building
      26192: Convert TaggingServiceImplTest to use retrying transactions!
      26194: ALF-7045: AVM upgrade - re-implement AVM "rename duplicates" patch as a DB upgrade script
      26195: Update installer overlay files
      26197: Final installer updates - built and tested on OSX
      26199: Allow relocatable data for postgres - part2
      26204: Attempt to avoid intermittent unit test failures in RecordsManagementAuditServiceImplTest by adding some Thread.sleep() calls to allow for asynchronous audit behaviour
      26207: Set site notification to false on install (ALF-6181)
      26212: Merged DEV to V3.4
         26203: ALF-7605 PostgreSQL: Upgrade from 2.1.7 to 3.4.1 is failing - constraint "alf_access_control_entry_acl_id_key" does not exist
             1. The statements which are drop constraints, marked as optional
             2. The alter statements with new constraint names were added
      26256: Fixes ALF-7679: Remove webscript-framework-config-custom.xml file
      26270: License updates from Ashutosh
      26274: Fix intermittent unit test failure with retrying transaction
      26275: Possible fix to intermittent test failure.
      26295: Reduce scope of retrying transaction, in a hope of fixing TaggingServiceImplTest.testOnStartupJob()
      26303: And the prize for the largest number of retrying transactions in a single unit test goes to...
      26307: Fixes: ALF-7704: Japanese language option not appearing in dropdown box on log in page.
      26314: Another defensive sleep() in RecordsManagementAuditServiceImplTest
      26325: Moved defensive sleep() in RecordsManagementAuditServiceImplTest
   26336: Fixes ALF-7713: Prevent folder/documents from being draggable in DocLib
   26348: Fix for ALF-7751 - encode all params on new Team dynamic welcome dashlet
   26351: Removed svn:mergeinfo
   26353: ALF-7745 - Add pop-up balloon validation helper to create site dialog.
   URL Name (shortName) is now also auto-generated from the site name (siteTitle) by removing characters other than 0-9, a-z, A-Z and "-", replacing spaces with "-" and converting to lower case. Auto-generation is stopped if the user edits the URL Name field themselves and restarted if they empty the field.
   Update to Preference Service to allow "-" character in preference keys.
   26355: ALF-7743 - Increase delay on "More actions panel" in document library
   26361: ALF-7758 - Site Dashboard: Welcome widget isn't removed immediately
   26364: Updated UI Text strings following review by Linton.
   26366: Fix for ALF-7757 - Calendar agend view encoding
   26368: Fix for ALF-7739 - Click activity link for a file after DnD upload results in an error
   26369: Merged V3.4-BUG-FIX to V3.4-TEAM
      26340: Fixed ALF-6377 "Incorrect behavior of Overdue filter in My Tasks Dashlet"
   26374: Further UI text updates from Linton
   26377: Updates to ACPs as part of ALF-7382 Translate/Localise HTML email templates.
     This check in adds localisations in de, es, fr, it, ja for the following email templates:
       activities-email
       imap_message_text_html
       imap_message_text_plain
       invite-email
       new-user-email
       notify
   26381: Set site invites on by default for Team.
   26384: ALF-7733 - Data list's type isn't included for deleted activities
   26385: ALF-3709 - User Status on Profile
   26389: Merged V3.4-BUG-FIX to V3.4-TEAM
      26372: Fix for ALF-7791 - no longer spews masses of exceptions when doc details page for a missing node is displayed.
             Node Metadata retrieval service now returns valid JSON in all cases.
   26390: Fixed ALF-7689 "Team: Dashlet names don't match dashlet titles"
   26391: ALF-7718 - Handle excel files without a freezepane, eg those created by hand rather than using the friendly template
   26394: Merged V3.4-BUG-FIX to TEAM
      26392: Removed code which sets the cm:title property to the filename in the upload webscript. This was causing an unnecessary auditable update.
      26393: Line endings
   26403: Fix for ALF-7832 - Licence warning for all users on WARN_ALL
   26409: ALF-7763 - Updates to dashlets in Team following usability studies, including: presentation of "no data" made consistent. Page-level inline JavaScript wrapped in module mark-up.
   26410: Fix license location for Win installs
   26425: Fixed ALF-7726: 'Repository Descriptor (Originally Installed)' form doesn't contain Name and Edition information.
   
   Also updated the 'Heartbeat Disabled' field in the License form to use a checkbox control.
   26426: ALF-7742 - Remove title field on simple edit metadata pop-ups
   26427: ALF-7665 - Team: Duplicate Help links in toolbar
   26434: ALF-7875 - CLONE -Unable to browse into folders in Share Site
   26435: Moved of Ent/Team logos to overlays, empty logos in place
   26437: Merged HEAD to V3.4-TEAM
      24723: ALF-5799: Type-ahead functionality for tags
   26438: Merged BRANCHES/DEV/dwebster to BRANCHES/V3.4-TEAM:
      26431: Latest Spanish language Pack updates
      26429: Latest Italian language Pack updates
      26428: Latest French language Pack updates
      26422: Latest German language Pack updates
   26444: Merged V3.4-BUG-FIX to V3.4-TEAM
      26186: Improvements to tree node handling and Bubbling library following investigation for ALF-6960 and ALF-7296
      26189: (Partial merge due to refactoring) ALF-7077 - Unable to set a Repository library root node by XPATH
             Merged HEAD to V3.4-BUG-FIX
                24021: Share Repository Browser support for xpath starting location. See comments in "RepositoryLibrary" section of share-config-custom.xml.sample.
                26183: ALF-6960 - Actions "Copy to..." and "Move to..." Repository don't display the Path. ALF-7296 - Copy or Move content from a site document library to the repository do not work.
      26191: Prevent MooTools JavaScript library being compressed on every build. Added minimized file to source tree. Added target "minimize-mootools-javascript" which inserts a reminder comment to the top of the minimized file.
             Also reverted inadvertant line-endings swap in build.xml from r25479
      26282: ALF-6728 - Unable to open office documents via Share Site > Document Library > All Documents > Edit Online
             Reworked calculations around the "location" field so that the attributes within are returned more consistently.
      26297: ALF-3113 - Data Lists: Delete/duplicate multiple items should affect only selected items on current page
      26298: ALF-7609 - Items numbering in document library in Share appears quite ambiguous in case of documents with working copies
      26312: ALF-4220 - Alfresco Share - Tag component - Unable to view more than 100 tags
             Object finder-based pickers now look for "maxSearchResults" in the control params (rather than the args property bag)
   26445: Merged V3.4 to V3.4-TEAM:
      26443: Installer build updates
   26447: Merged V3.4-BUG-FIX to V3.4-TEAM
      25975: ALF-5625 - When viewing properties in version history hitting close results in loop
      26174: *Record only* Fix spring-surf library versions after merge in rev 26144
      26175: Fix for ALF-7201 - Unable to create group with other name if group identifier is already exists
      26187: Fix for ALF-7297 - Share Advanced Search does not work if the property name include a minus (or any symbol not supported by SQL92 identifier standard)
      26240: Fix for ALF-7462 - Share - User profile / Non-ASCII characters display (double encoding of user description field)
      26242: ALF-3767 - Creating account with 0 quota in Share gives unlimited quota
      26279: ALF-7682 - Fix to correctly take the 'external-auth' config setting into account when testing for login auth against the default alfresco endpoint.
      26280: Fix for ALF-7391 - In the search properties in share, repository is spelt wrong.
      26401: Fix for ALF-7428 - Share: User cannot add comment to content when the 'admin' user is not in administrator group
      26405: Fixed ALF-7224 "Share - Scrollbar issue on dashboard customization page"
   26451: Merged V3.4-BUG-FIX to V3.4-TEAM
      26399: Fix for ALF-5863 - DOCLIB: large number of tags slows doclib rendering to unusable.
             Number of tags to display in the Tags filters is now configuration and defaults to 100 items. Can be configured with value of -1 to show all tags.
   26456: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4-TEAM:
      26450: Latest Japanese language Pack updates
   26458: Merged BRANCHES/V3.4/ to BRANCHES/V3.4-TEAM:
      26417: Fixes: ALF-7414, confused and hardcoded date-formatting & date formatting translations fixed.
      26414: Fixes: ALF-7697 - Rewording the URL help text on the create site dialogue
      26413: Fixes: ALF-7765 - ensures naming consistency
   26461: Merged V3.4-BUG-FIX to V3.4-TEAM
      26243: Fixes ALF-7301: IE6 CSS updates to prevent layout corruption on datagrid
      26404: Fixes ALF-7348: Copy to/Move to width changes for IE6 & IE7
      26453: Fix unreported issue with the appearance of tags in the object finder being stacked vertically rather than horizontally for IE6 and IE7.
   26464: Merged V3.4-BUG-FIX to V3.4-TEAM
      26463: Follow-up fix to r26453 for full-page edit mode
   26465: ALF-7869 - Layout is broken if many tags are added to the item (Document Library browse view)
   26466: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4-TEAM:
      26459: Fixes incorrectly translated stirngs.
   26467: Merged V3.4-BUG-FIX to V3.4-TEAM
      26334: Fixed ALF-6289 "Contributor is absent in Permissions section at the details page" part 2 - now also on folder details page
   
   26468: Fixed bug when content size was 0, now the "Preparing previewer..." message is replaced with a message saying "This document has no content"
   26469: Fixed ALF-7744: Ensure that new options.limit gets set when updating RSS feed results
   26472: Activity list: css class for each activity type into config
   26473: Remove references to non-existent client-side "document-details.js" file
   26475: Calendar UI Bug fixes & improvements from usability feedback (inc. ALF-7592, ALF-7588, ALF-7590, ALF-7594, ALF-7589, ALF-7595, ALF-6959)
   26477: IE6/IE7 css fixes: Fix footer layout and prevent unnecessary horizontal scrollbar
   26482: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4-TEAM:
      26480: Latest Update from Translators via Gloria.
   26485: Fix for ALF-7728. Incorrect information at the Trash page.
     The 'archived by' as returned from the REST API was not the user who archived the node, but was instead the
     original owner of that node. This has now been corrected.
   26494: Small fix from translator
   26496: Installer NLS updates
   26498: Merged V3.4-BUG-FIX to V3.4-TEAM
      26486: Fix for ALF-7602, ALF-7734 - Incorrect behavior of groups - groups in non-default zone displayed in Share UI
   26501: Added translations for "Contributor" role.
   26506: Merge V3.4 to V3.4-TEAM:
      Fixes ALF-7735: Update to postgres.xml to make use of vcruntime on 64-bit windows (fix dependent upon additional update to ALF-BINARIES)
   26513: Merged V3.4-BUG-FIX to V3.4-TEAM
      26512: Fix for ALF-7921 - Script error occurs when is added 'Image preview' dashlet.
   26516: Fixed ALF-7791 "Clicking the activity link for a file after deleting that file results in an error"
   26517: Removed unused component files since document details page refactor
   26532: ALF-7946 - It's impossble to destinate More+ administrator menu.
   combinePaths() function reworked to maintain trailing "/" if the last argument ends with one.
   26536: ALF-7948 - IE Specific - It's impossible to download document via Download button at the details page
   26541: Fixed ALF-7868: Import site doesn't work (QA were trying a scenario that we aren't supporting, removing the old sample context file to avoid problem/confusion)
   26545: Fixed ALF-7001 "Customize site drag and drop - page item is added to end of list if quickly dragged and dropped"
   26550: Fixes: ALF-7935, typo in message string.
   26556: UI improvements and Ajax-ified performance improvements to Image Summary dashlet
   26561: Fix for ALF-7888. Sites are not recovered.
   The fix applied is to mark site nodes with the sys:temporary aspect within the SiteService in order to have them be fully deleted immediately and not go into the trashcan.
   26562: ALF-7925 - Incorrect behaviour of Categories cloud at the Document Library page
   26563: ALF-7912 - Incorrect behavior of items marked as favorite - IE specific
   26570: Update build to correct installer file names.
   26572: Team installer build tweak (added back project filename removed during merge)
   26573: Merged V3.4-BUG-FIX to V3.4-TEAM
      26564: Fix for ALF-7965 - Content page of user profile not updating properly (modified docs always shown in the recently added list)
             Improvements to show filetype icon - FreeMarker macro to mirror basic functionality of Alfresco.util.getFileIcon
   26574: ALF-7962 - Team: Create Site dialog fields aren't cleared on Cancel
   26575: ALF-7970 - Links 'Show Earlier Events/Show Later Events' don't work in IE browser
   26578: Merged V3.4 to V3.4-TEAM:
      26542: Fixes ALF-7954: Ensure that installer copies SWFTools to correct location
   26586: Added script model object "msg" helper to retrieve I18N messages for template level JS controller (mirroring the support in WebScript component JS model)
   26595: ALF-7982 - Filetype icon isn't displayed for topic's reply in activities
   26597: Fixes ALF-7845: Provide tooltip assistance when DocLib upload dialog launched from site welcome dashlet (when DnD is available)
   26605: Fixed ALF-7681 "Renames of Document Library not reflected in page title."
   26617: removed svn:mergeinfo
   26622: JMX Admin pages UX fixes:
   - The Save & Cancel buttons on the jmx admin console pages have been configured not to be displayed.
   - A a "Cancel" link is present instead. 
   - The "Operations" header has been removed
   - The "save operation" button now has an "Update" label instead of "Save"
   26625: Reduced distribution artifacts to minimum (now no E3.5 planned)
   26653: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
     26619: ALF-6244 - Creating the initial version of a node shouldn't update the Auditable properties
     26623: Add new Version Service method "ensureVersioningEnabled".
     26624: ALF-6121 + ALF-6244 - When activating lazy versioning for share, use a ScriptNode call to the Version Service
   26654: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26631: Improvement related to ALF-6650. Secured PDFs in Acrobat 9 fail to rendition.
   26657: Merged V3.4-BUG-FIX to V3.4-TEAM
      26655: Add parameter comments around ensureVersioningEnabled() function call.
   26660: Fixes ALF-7955: Update error message when dropping zero byte size files or folders into doc lib
   26662: Merged V3.4-BUG-FIX to V3.4-TEAM
      26661: ALF-8053 - Document Library is attempting to create thumbnails for types that are not subtypes of cm:content. Also prevent thumbnail webscripts from attempting to generate thumbnails for in the same cases.
   26665: Fixed ALF-8042 "Renamed page component reverts to default name when moved (Customize Site page)"
   26673: Merged V3.4-BUG-FIX to V3.4-TEAM
      26672: Consolidate multiple occurrences of "#yui-history-iframe" style into base.css
   
   Also fixed markup issue in console-tools that was confusing MSIE browsers.
   26676: Additional fix for ALF-7687 "Ability to use wild character in People search - Should add configuration to allow zero characters for all search in Team config."
   - start workflow component now picks up global min & max search length config
   26677: ALF-8019 - Delete folder window has incorect name
   26678: Merged V3.4-BUG-FIX to TEAM
      26383: Fixed ALF-7692: Non-admin users can move content into Company Home
      26430: More ALF-7692: Non-admin users can move content into Company Home
      - Handles duplicate ALF-7923
   26679: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26439: Probable fix for ALF-7482. Custom ImageMagick parameters not being accepted on Linux Alfresco server.
   
   26680: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26474: Fix for ALF-6730 Preview and thumbnails are not update with new revision of the document is uploaded.
          Added a compensating action to ensure that renditions are deleted when re-renditions fail on new content.
   26682: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26675: Fix for ALF-7334 Could not upload new Version all Dokuments.
            Issue was resolved by adding "RunAs System" boilerplate to the few places that load (and in the case of the WQS, delete) rendition definitions.
            We purposely did not add this boilerplate within the RenditionServiceImpl.loadRenditionDefiition() method as we want to retain effective permission controls for normal client code.
            Added some javadoc to highlight the permissions issues involved.
            I also took the opportunity to add a convenience method to the RenditionService, namely render(NodeRef, QName) which will allow client code to execute built-in rendition definitions (e.g. thumbnails) without worrying about permissions on Data Dictionary. That method wraps the equivalent render(NodeRef, RenditionDefinition) in a RunAs System.
   
   26685: Fixed ALF-7880 "Download version form version history shows incorrect document name"
   26688: ALF-7919 - Use 'Properties' instead of 'Metadata' in actions, titles etc.
   26690: Partial fox for ALF-8014. thumbnail and file type aren't generated for *.eps files
     A placeholder 'doclib' icon is now available for .eps files.
   26697: ALF-7004: TR28: Create HTML email templates (Implemented Linton's richer HTML email template design)
   
   Also removed the timestamp from the email subject for the Activities email as the timestamp is now within the body of the email.
   
   NOTE: You need to start with a clean database in order to see the new templates.
   26698: Build fix since label change of Start operation button in admin console (JMX) forms.
   26699: Fixed ALF-7886 "Click here to Download gives incorrect document name"
   26700: Fixed ALF-7801 "Incorrect hint for Upload new version action in Versions pane"
   26702: Fixed ALF-7857 "Team: Inconsistency between DocLib action and tooltip text"
   26703: Fixes ALF-7762: Add tooltips to dashlet toolbar actions
   26704: Fix for ALF-7785 - Agenda View doesn't always update list after Edit/Delete of an item
   26708: Merged V3.4-BUG-FIX to TEAM
      26664: Fix build (DOD5015 security context and test refactor)
   26709: Slight reworking (and rewording) of the tooltip on the upload dialogs when drag and drop is available (the "#upload" use case)
   26710: Move style fixes into IE specific CSS files to avoid breaking layout on other browsers
   26712: Merged V3.4-BUG-FIX to V3.4-TEAM
      26711: ALF-3833 - Share - Phrase tags
   26714: ALF-8081 - W3C: a highlighting of drop-down menu (Sites, People) in toolbar is invisible in Safari.
   26715: Tweak to imagesummary dashlet node cloning performance
   26716: ALF-8082 - W3C: it's impossible to select a lot of links in Safari
   ALF-8083 - W3C: it's impossible to select Site Pages in Safari
   26718: Fixes for ALF-7874, ALF-8012 - Mimetype map additions, filetype icons.
   - also replaced worlds-largest if-else freemarker statement with inline map for Forms mimetype lookup
   26719: Further fix for ALF-8014. Thumbnail and filetype not generated for *.eps files.
     I've added a -file-48.png for the .eps mimetype.
     I copied it from one of the other image -48.png files as they're all generic 'img' icons anyway.
   26721: Fix for ALF-7963 Team: Can edit another user's email notification settings
   26722: Collapsed/expanded state of Properties panel wasn't being remembered on Details page. Removed "collapsed" parameter for Alfresco.util.createTwister which won't work with our current implementation. Pre-empted "alfresco-twister" class for slow-loading components.
   26723: Changed component initialisation event from onContentReady to onAvailable which should improve appearance/decoration times slightly.
   26724: ALF-8089 - W3C: a highlighting of "Show Earlier Events" and "Show Later Events" links in toolbar is invisible in Safari
   26731: ALF-8095 - Error shown after clicking the accept or reject link in a site invitation email
   26733: Merged V3.4 to V3.4-TEAM
      26530: Fixes ALF-7949: Remove service script on uninstall
      26610: Fix for: ALF-8007: Lucene index not coherent or not up to date or we can not rely on it to check that a working copy exist.
   26734: Merged V3.4 to V3.4-TEAM (RECORD ONLY)
      25971: ALF-7441: Help URLs pointing to new doc system (1 of 2)
      25972: ALF-7441: Help URLs pointing to new doc system (2 of 2)
      25980: Merged V3.4-BUG-FIX to V3.4
         25978: ALF-7394 - Alfresco Network dashlet, now Alfresco Support information
      26056: Merged V3.4-TEAM to V3.4
         26053: Added in loop to wait for asynchronous post-failure auditing (ALF-3055)
      26100: Merged V3.4-TEAM to V3.4
         25985: Another cycle of fixing installer from Win builds.  Still waiting for official fix from Bitrock.
         26067: Fixes for installer builds on Windows
      26127: Merged V3.4-TEAM to V3.4
         26120: Fix postgres.bki on Win builds
      26165: Merged V3.4-TEAM to V3.4
         26161: Fix full installer.
   26737: Google Docs: Added better handling of unsupported mimetypes
   
     * Meaningful exception raised when mimetype unsupported by GDoc (rather then non-specific error from google)
     * Message not reflected in UI, but log contains details of failure
   
   26738: Clarified browser relevance for "in-memory-limit" config parameter following ALF-8093 being raised.
   26740: Quick build fix following Google Docs updates in r26737
   26741: Build Fix
     * Added missed exception class
     * backout previous fixes
   
   26746: Fixed ALF-8080 "WebM playback not working for Team and Chrome"
   26750: Prettifying the delete url for comments to avoid two ampersands following each other, i.e: "&&". This is NOT a fix for deleting content with "%" in the name.
   26753: Fixed ALF-7807 "It's possible to rename component with spaces"
   26756: ALF-8102 - Edit Properties, Edit tags, Manage permissions, Start workfow icons are not visible - IE 7 specific
   26758: ALF-8106 - "Go Back" button doesn't work on the "User Profile" page
   26763: Fixes: ALF-7815 - Added .ics extension and site name to downloaded file.
   26779: Merged V3.4 to V3.4-TEAM
     26760 : Enterprise unlimited licenses get invalidated turning the system into read-only mode
   26782: Fixed ALF-7001 "Customize site drag and drop - page item is added to end of list if quickly dragged and dropped"
   26784: Minor height adjustment to "My Documents" dashlet on first use
   26786: Correction to merge 26779


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-04-11 19:26:26 +00:00
Paul Holmes-Higgin
cefda8c965 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:48:39 +00:00
Paul Holmes-Higgin
43e93f3c14 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:09:17 +00:00
Roy Wetherall
0701249fe5 ETHREEOH-957: The delete preference webscript seems to not do anything
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17189 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-27 15:55:15 +00:00
Dave Ward
facbdaf5b7 MOB-412: Decouple thread local authentication methods from AuthenticationComponent into new AuthenticationContext super-interface. The AuthenticationContext is a delegate of AbstractAuthenticationComponent and can be accessed directly by low-level classes (e.g. schema bootstrap) before the authentication subsystem is available.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-23 14:01:29 +00:00
Derek Hulley
198ebe371e Merged V3.1 to HEAD
13256: Fix ETHREEOH-1221   Hard-coded use of "admin" username
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r13256


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-12 21:48:15 +00:00
Jan Vonka
cd09266213 Merged V3.0 to HEAD
12145: Merged V2.2 to V3.0 (AuthenticationUtil)
    12109: AuthenticationUtil and AuthenticationComponent refactor
  12152: Removed Lucene usage from lookup of 'sites' root folder
  12153: Fix InviteServiceTest by cleaning up leaking authentications
  12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-19 12:15:59 +00:00
Roy Wetherall
2c02d2a9d4 Site Service: Add permission bag that can be passed to JS create container API
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-07-17 15:29:41 +00:00
Roy Wetherall
fd3a6d6e97 Preference Service
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-06-23 09:48:22 +00:00