Bump to dev version
Fix count_spec

Use the appropriate arity to get Enumerable#count to handle its args
correctly.  Note that we need to switch from JavaInternalBlockBody to
a BlockCallback since JavaInternalBlockBody does not currently get its
arguments prepared correctly for the given arity.
Merging jruby-1_7