a few changes that got left out when resolving conflict when merging pulp2.1 to master