Fixes issue with collection query whitelist disappearing on paginated links

- Essentially, the collectionRouteOptions needed to be set regardless of
  whether or not we have a self link.
Merge branch 'hotfix/tests'

Fixes issue with collection query whiteliest on paginated collections