Fix pep8 errors

This commit fixes pep8 errors.

Change-Id: Ia1f1d61081a86b8a58251918392171cbc60f5ab8
Merge "Fix pep8 errors"
Merge branch 'master' of github.com:openstack-dev/devstack