Merge pull request #2843 from anandpdoshi/anand-feb-24

[fix] Added unicode_literals if missing in py files