r.24479 Merge from V3.3-BUG-FIX to V3.4
r.24478 Merge from V3.3 to V3.3-BUG-FIX
r.24477 Fix for ALF-6130. infinite recursion in RenditionServiceImpl.loadRenditionDefinitions(String)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24866 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261