Merged DSCP edits into trigger version of acl.parser.

Had already pushed these changes into the acl fork, but need them to be incorporated into Trigger because the separation is not yet complete.