Improve Confluence orderly shutdown

Every time we shut down our Confluence production system it can take up to 20 minutes to shutdown, and we are often not very confident about killing it when we do shut it down. It seems the Confluence's process does not properly respond to a SIGTERM most of the time, and must eventually be killed by force (which is what your shutdown scripts do, in one way or another).
Unfortunately, we know that a force-kill too early can result in DB corruption, so we are often hesitant to force-kill.
On the other hand, Confluence shutdown is a major driving factor behind the length of our maintenance windows, which for a mission-critical application is a major problem.

Please improve Confluence shutdown so it responds properly to SIGTERM and shuts down in an orderly fashion, and we are not left guessing about whether a force-kill will result in DB corruption every time we have to shut it down for a maintenance window.