Update ondemand configuration

Enable multicore sync on thread migration
Remove leftovers
Merge branch 'cm-10.2' into martincz