Add cleanup code to calamari-server.  Include pkgdir parameters that
were missing.