Pre-r13b modifications.

Includes:
a019096 cherry-pick fix to make __func__ C99 compliant.
73 files changed