Merge changes from topic "libsnapshot_api_update_engine"

* changes:
  libsnapshot: Cancel/merge existing update before begin
  libsnapshot: operator<< for UpdateState