Merge remote-tracking branches 'witlessbird/smart-proxy-pulp-1.0.1' and 'jlsherrill/pulp' into rpm/develop
Merge remote-tracking branches 'witlessbird/smart-proxy-pulp-1.0.1' and 'jlsherrill/pulp' into rpm/develop