WHIRR-198. support user-defined images (rewrote to fix classpath ordering issues) (Adrian Cole via asavu)