Bug 20722: Need to free buffer if we hit deadlock
Bug-20698 - Fix Doxygen syntax errors