Squashed commit of the osgi-jruby-bundle branch

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>