Merge pull request #1317 from jbertram/HORNETQ-431_master

HORNETQ-431 - Large Messages Files NOT DELETED on unbounded address
https://bugzilla.redhat.com/show_bug.cgi?id=1013536 - allow replicated backups to restart after failback
Merge pull request #1321 from andytaylor/master

https://bugzilla.redhat.com/show_bug.cgi?id=1013536 - allow replicated b...
https://bugzilla.redhat.com/show_bug.cgi?id=1013536  - fixing tests