Merge "Restart trust agents when updated or when they are dead" into lmp-dev