1021099  - Rename puppet.conf -> pulp_puppet.conf

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1021672