Merge pull request #241 from raghavgautam/master

HCatRetention cleanup