Reworking ImageMagick to see if we can sort out the issues with the RPM build to make it work correctly.

Also including an RPM build of openjpeg-2.1 to see if we can sort out the issues on the Amazon AMI image.