Switch to limit/offset and add legacy support for page/pageSize.
Fix test case exception.
Merge branch 'feature/connery/limit-offset' into develop