Update error (heading toward better task errors).
Merge error tree.
Fix issues found by clang.
Merge lp:~brianaker/gearmand/error-update/ Build: jenkins-Gearmand-754