jenkins: retab + some linting

Change-Id: I34ae59204fa397473c277a7c56ae00986f037296
Merge "jenkins: retab + some linting" into production