Merge pull request #1181 from jbertram/2.2.eap5

HORNETQ-1047 - Fail-over after fail-back doesn't work in JBoss AS
HORNETQ-1246 - Paging problem after server restart