Fixed some comments as per mhrivnak's suggestions.
Merge branch 'rbarlow-949186' into pulp-2.1