Fix SPW delete test timeouts (see #11540).
Merge pull request #1855 from bpindelski/rebased/dev_4_4/spw-delete-testfix

Fix SPW delete test timeouts (see #11540). (rebased onto dev_4_4)