Merge commit '448f2627c169092d2091a1be22feb6a7775f6201' into m0-broken

Conflicts:
	include/net/bluetooth/bluetooth.h
	include/net/bluetooth/hci.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/l2cap.h
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/rfcomm/sock.c