Review for AVRO-680 patch

[S G]

Hi,

Could someone please review the patch for AVRO-680?
(https://issues.apache.org/jira/browse/AVRO-680)

I have incorporated all the suggestions and also tested it extensively.
The patch is complete with unit-tests.

Thanks
Sachin