delete mis-committed diffmerge tmp files
atlys-multicore: add missing FEATURE_MULTICORE("ENABLED) on cpu0
sockit-multicore: add missing FEATURE_MULTICORE("ENABLED) on cpu0

...also add the traceport debug wires, since I used that to
find out that I had missed the parameter...