added osgi manifest entries [skip ci]
maven-3.1 is also supported now [skip ci]
Merge branch 'master' of jruby.org:jruby [skip ci]