Copy recent changes from ui-tests and fix the MemoryConsumer classpath.