fixes #7108 - if using pulp at all, override both pulp and pulpnode settings
Merge pull request #104 from jlsherrill/7108

fixes #7108 - if using pulp at all, override both pulp and pulpnode settings