Merge pull request #742 from clebertsuconic/Branch_2_2_AS7

https://issues.jboss.org/browse/HORNETQ-1101 - fix on non-persistent messages on paging
Extra diffs on the production branch