Fix minor API Kill Bill weirness that were highlighted when running jruby test integration
Merge branch 'master' of github.com:killbill/killbill
Rebuild ruby test plugin dependencies.
Merge remote-tracking branch 'origin/master' into leaner-build

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

Conflicts:
	api/src/main/java/com/ning/billing/payment/api/PaymentMethodPlugin.java
	osgi-bundles/bundles/jruby/src/main/java/com/ning/billing/osgi/bundles/jruby/JRubyActivator.java