(PUP-1463) Enable puppet.service during upgrade if puppetagent.service was previously enabled