UAR-629: Squashing all commits into one for peer reviewing.
First pass at integrating Vivek's code from 3.1.1

Moving SortByValuesFinder.java in the right package

Deleting SortByValuesFinder.java from old location