NCI-Agency/anet#328: Put constraints into separate (database dependent) changeset
NCI-Agency/anet#328: Put constraints into separate (database dependent) changeset

Also fix XML formatting.

NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet,NCI-Agency/anet