Merged BRANCHES/DEV/WORKP1 to HEAD
21224: ALF-3885: find multiple class behaviours through type hierarchy (not just first)
21249: ALF-3885: follow-on to r21224 (to fix PersonServiceTest.testSplitDuplicates)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261