Clean up whitespace
Update schema to support aquilon plenary changes
Merge pull request #11 from quattor/aquilon-1.11.9

Update schema to support aquilon plenary changes
Merge pull request #1 from quattor/master

Update