Pep8 cleanup for modules/deployment

Change-Id: I958d002476f8680edde02baf9beb6999aaf866f3
Merge "Pep8 cleanup for modules/deployment" into production