Make cli and daemon use new buxton_direct_close function.

Signed-off-by: Michael Ikey Doherty <michael.i.doherty@intel.com>