Added bundle_id as copy of service_name which makes it launchable.
Merge remote-tracking branch 'upstream/master'