Issue #3094304 by tedbow, bnjmnm, dww: Create tests that cover contrib non-full releases and contrib patch versions (cherry picked from commit ae75f067) (cherry picked from commit 3c114e30)