[DS-1779] - Pagination link error in JSPUI discovery search

Resubmission of pull request, master branch only for now (will cherrypick 4_x later), simpler diff