Merge pull request #1306 from clebertsuconic/master

https://bugzilla.redhat.com/show_bug.cgi?id=1013777 - Fixing intermitten.t failure on BackupSyncLargeMessageTest::testDeleteLargeMessages
Merge pull request #1311 from clebertsuconic/master

tweak on test
Refactoring protocols to support client plugability