Merge pull request #1363 from neild/jsonnull

jsonpb: accept 'null' as a valid representation of NullValue in unmarshal