126145 jphuynh: MNT-16255: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
126143 jphuynh: MNT-16254: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
126141 jphuynh: MNT-16253: Fixed ImageMagick config folder path.
- This commit will be merged to all HF branches so that it will be included in all future HFs.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.1.1/root@126182 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261