Simplify the abort exception case
Notify listener of AbortException cause, and include message in AbortException
Merge remote-tracking branch 'upstream/2.2.x' into 2.2.x-iso-8601-date-format