MB-8385: All flag to force overwrite of data

1. we will allow conflict resolution when writing data to server.
2. No change when we read data from server.
3. No support to restore data to version 2.0.1 and before.

Change-Id: I217837ca325bb3cd8642444b2cb63a7fc527ea19
Merge branch 'branch_2.0.2' into branch_2.1.0

* branch_2.0.2:
  MB-8385: All flag to force overwrite of data

Change-Id: I3f9d59be493c3139d8b08e88fe237843708efe77