Supporting replication v2.1 specification as well as failback capability. Change-Id: Idb2fae7f5caa240f6c347e60953d5dd1cdf3f8c8 Closes-Bug: #1547543