Merge changes from topic "bullet_mapping"

* changes:
  Add strings for bullet permissions
  Mapping device profiles and resourceIds