Reconcile conninit + BT + dbadd

Change-Id: I70d29154a215a4a5c1032b22f4754fda5425e5a4
Signed-off-by: DHOMD <DHO@dho.im>