Bug 433150 Reorganize structure of runtime bundles / packages
- merge had change linenumbers in o.o.Team, adjust constants to fix smap
2 files changed