Merge changes from topic "incl_svc_parsing_fix"

* changes:
  Fix included service parsing (3/3)
  Bluetooth: fix typo in comment