Merge "set default shutdown timeout to 6 secs"