fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case
fix merge conflicts
Merge pull request #7570 from owncloud/fix_issue_imagick_non_static_4

fix issue with Non-static method Imagick ../..; @ doesn't seem to work in this case