rm trailing whitespace from master.py
Merge pull request #7219 from hulu/trailing-whitespace-master

rm trailing whitespace from master.py