Aborted -> Error.

@bug W-2033974@

@rev eric.anderson@
@P4CL: 8583788@
Merging origin/goliver/master-pending-aborted-error into master