Update schema to support aquilon plenary changes

Tested with aquilon 1.11.9 and our SCDB instance.

Includes white-space cleanup as a separate commit.