Re-factor output of database_statistics

This re-factor is limited to changes which has a minimal affect on
the tests.

The only difference in the output is that the header rows are now
linebroken and make consistent use of whitespace.

Change-Id: I4169532e656ed19aac6a9fd123f03302ac291486