B-60117 Handle shutdown without Destroyable, pom dependency
Fixing comments