Merge "Fix bug introduced in last change.  GATT define was after BLE_INCLUDED define." into klp-modular-dev