Fixed pep8 issues arising as part of merge

Fixed pep8 issues arising as part of merge

Signed-off-by: root <root@localhost.localdomain>
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>