Merge changes I4b77af22,Ib5bc2de5

* changes:
  Sync: Improved error message when manifest server RPC call fails
  Sync: Print name of manifest server used for smart sync/smart tag