PEP8 with tox -epep8 check fails

Change-Id: Ife06919f321ab4ad73bece2e6080fbd7d947eeef
Fixes: bug #1219014
Merge "PEP8 with tox -epep8 check fails"