[Subhas] Fix Netbook-to-netbook and Netbook-to-server sync
Merge pull request #609 from rdsubhas/master

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