add extra wait time when "applying a snapshot" in addition to "reorganizing" as it can take forever to open a server in these cases.
add extra wait time when "applying a snapshot" in addition to
"reorganizing" as it can take forever to open a server in these cases.

Change-Id: I216de280dc832805ef9432be79e974bf096e42f0

benedictpaten/cactus,benedictpaten/cactus,benedictpaten/cactus,benedictpaten/cactus,benedictpaten/cactus