[JBJCA-1220] Graceful shutdown enhancements