fix null case and RubyHash when creating a new ConvertingMarshaller  - fixes #2120
Merge pull request #1 from jruby/jruby-1_7

fix null case and RubyHash when creating a new ConvertingMarshaller  - f...