(PUP-1463) Enable puppet.service during upgrade if puppetagent.service was previously enabled
Merge pull request #2269 from skottler/PUP-1463

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