Fix Bug 887498 - Add pagination to /me
Rebase fixes