Fix missing bundle resources
Merge branch 'build-with-maven'