Use local versions of p2 dependicies and remove sonatype
Merge branch 'build'