Merge branch 'hotfix/collection-route-injection'

Fixes issue with collections not having collection route injected
Merge branch 'develop'

Merged in improvements to link generation modification for resources inside collections.
Re-use matched route params when generating links
Merge branch 'hotfix/reuse-matched-route-params' into develop