prepare for next development iteration
Alfresco 4.2 upgrade
Merge remote-tracking branch 'upstream/master' into alfresco-4.2