Mostly mechanical updates for caddr_t, thread, mutex, and credentials

Resolve conflicts

KNF. Remove extra spaces. No functional change.

branches: 1.1.1;
Initial revision