pep8 fixes + another commit rolled in because jenkins

- Ignore everything after first newline (or \r)

Change-Id: I69266857d2600fa69f569addc9a1dd02098ba28b