Add retry action for storage or def registry errors.

@bug W-2370383@
Merging origin/bob/master-pending/retry-action-storage into master