Fixed trunk pep8 errors

Change-Id: I9f5136402d03fe832c2eae6e09d841276784d2bf
Closes-Bug: #1388980
Imported Translations from Transifex

For more information about this automatic import see:
https://wiki.openstack.org/wiki/Translations/Infrastructure

Change-Id: I1934128fdcb9d983f89e0ec43f611b9820a44ed0
Merge "Fixed trunk pep8 errors"