CORE-5583: More corrections to DR selection model
CORE-5583: Updated Gwtmockito version