Cleans up the cactus service shutdown.
Merge branch 'master' into sre-description

Conflicts:
	src/main/java/io/github/egonw/CMLEnricher.java