Merge changes I6686a15d,I6c561d51

* changes:
  Set Timestamp By the Server when the client called 'set'
  Simplify Connector class APIs and hierachy