Improved the option sorting code in IndividualTypeRetryController VIVO-154
Merge branch 'issue-vivo-154' into develop