Merge remote-tracking branch 'origin/CRAFTERCMS-392'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Enterprise dependencies added for alfresco 4.2.0
Merge pull request #156 from dejan-brkic/4.2.0-ent

4.2.0 ent