retab, quoting, linting of ishmael.pp

do this first, next move it to module,
less changes in a single patch set

then put the definition into its own file
to also get rid of warning that a
"definition (is) defined inside a class"

Change-Id: I15ed9f259ec810781e34a22bced40bc90e99bc20
Merge "retab, quoting, linting of ishmael.pp" into production