The previous default timeout was 10 seconds, which does not always
allow services enough time to shut down safely.

Change-Id: I54eff91567108a7e5d99f067829ae4a6900cd859