Merge "Fix image not regenerating on changes to bootclasspath"