Merge "Add ABORT support to Obex lib"