Merge from Trunk revisions 740276 - 741103. Hooked in the new AFP resource level defaults into the IF-size of the image handlers.