fix tests for new onFlush PageListener method
Merge branch 'master' into 2.1