[Subhas] Fix Netbook-to-netbook and Netbook-to-server sync
Merge pull request #610 from rdsubhas/release-1.1.0

[Subhas] Fix Netbook-to-netbook and Netbook-to-server sync