minor fixes

Conflicts:

	kernel/sched/features.h

Change-Id: Ica5ba7ec8ee673862861b7b217093e6ce96894df

Conflicts:
	net/bluetooth/l2cap_core.c