Add workaround for tagged5 -> tagged6 transition for moved pidfiles