Migration update for pagination helper and lock
wording
Merge pull request #848 from dereuromark/2.5-pagination-lock

Migration update for pagination helper and lock