Merge 1161769 & 1161770 from trunk to 1.5 branch. Fixing RAT issues with AVRO-872 & AVRO-877. Also update version preparing for 1.5.3 RC build.