Merge pull request #1968 from clebertsuconic/2.4.x

https://bugzilla.redhat.com/show_bug.cgi?id=1169781 Improving depaging process
https://bugzilla.redhat.com/show_bug.cgi?id=1169781 Fixing tests broken after Paging fix

Changing the order of depaging introduced an extra check that needs to be checked now.
This will probably take care of the issue by checking if the page is complete before depage.