Merge pull request #427 from pulp/rbarlow-949186

Rbarlow 949186
Merge branch 'rbarlow-949186' into pulp-2.1
950011 - Corrected supported versions
Merge pull request #431 from pulp/jdob-950011

950011 - Corrected supported versions
Merge branch 'pulp-2.1'