Fixing PEP8 and adding msg

Change-Id: I60367e3073a30b2a3fa79bf4b10278de8fd7ecc1
Merge branch 'cloudkeep_working_smoketests' into cloudkeep_jenkins