Merge pull request #330 from rdsubhas/master

1280 | Server-to-server replication
Akash - fixing some of the broken tests
Akash - fixing remaining tests
Merge branch 'master' of git://github.com/rapidftr/RapidFTR