* merges from previous branches are now possible without tree conflicts
* added back missing commits when structure was changed (r59445, r59446) .. see RM-765
* updated Maven POM's to use existing code structure
* NOTE: r59454 and r59473 may have been missed in this update .. will go back and re-add
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@59491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261