RESTEASY-994: Modified variant selection.
Merge pull request #456 from kylape/Branch_2_3_7

RESTEASY-994: Modified variant selection.