NOJIRA: Fix three trivial spelling typos in log messages.
NOJIRA: Fix one more trivial typo in log message.
NOJIRA: Another trivial typo fix.
Merge branch 'v4.0' into ucb-deploy_4.0
Merge branch 'ucb-deploy_4.0' into cinefiles_4.0