PAHMA-964: Fix accidental swapping of pageSize and pageNum.
Merge branch 'ucb-deploy_3.3' into ucjeps_3.3