2013.07 - increase timeout when waiting for server to stop prior to termination