Tweaks.
remove Disco.TRACE
add ActivityStateMachineSchema
Remove obsolete relationship manager
Next stage of activity switching
Merge remote-tracking branch 'upstream/develop' into develop