Fixes enabling build (mainly Licensing, Codestyle, Poms)
Merged conflicts
Conflicts merge, coding style fix