Quick fix for cluster deletion timeout test

Change-Id: I8d8caeb69a0252afa2ac67313ec94091e798a597
Closes-Bug: #1305734
Merge "Quick fix for cluster deletion timeout test"