fixed: missing suffix of pid file
Merge branch 'master' into next
fixed: service pattern to catalina_base, different to catalina_home on debian