Fixup service matching so that OpenVPN and CP instances aren't missing after one was added.