Merge bar-descriptor.xml

Customization can be done in the build scripts