Fixes #2064 - manage puppetmaster if passenger is not used