Changed pom to use latest oss-parent from sonatype
Merge remote-tracking branch 'origin/master'