Update for JLO

We also use updated display-legacy (memtrace added in cm-11.0-jlo branch)