Merge pull request #523 from pulp/mhrivnak-1097816

1097816 - adding "gpgkey" as a valid distributor config value
Merge branch 'pulp-2.4'