Another attempt to fix enqueueAction test flapper

@bug W-2331530@
@rev gtorres@
Merging origin/tbliss/master-pending-enqueue-action-flapper-fix into master