ECMS-6444 : fix pagination mecanism
ECMS-6444 : fix unit tests
Merge branch 'fix/4.0.x/ECMS-6444-2' of http://github.com/exodev/ecms into fix/4.0.x/ECMS-6444-2