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
move setting backupUpToDate to false until replication is restarted
check data dir is recreated