Rebase

NOTICE

@@ -302,10 +302,7 @@ The following software have components provided under the terms of this license:
 - nio-stream-storage (from https://github.com/synchronoss/nio-stream-storage)
 - okhttp (from https://github.com/square/okhttp)
 - okhttp (from https://github.com/square/okhttp)
-<<<<<<< HEAD
-=======
 - okhttp-logging-interceptor (from https://square.github.io/okhttp/)
->>>>>>> b4a1fa79b20be9c429413db5f48ddacc46cedc26
 - okhttp-urlconnection (from https://github.com/square/okhttp)
 - okhttp-urlconnection (from https://github.com/square/okhttp)
 - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
@@ -328,16 +325,9 @@ The following software have components provided under the terms of this license:
 - resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
-<<<<<<< HEAD
-- resilience4j (from https://github.com/resilience4j/resilience4j)
-- resilience4j (from https://resilience4j.readme.io)
-- resilience4j (from https://github.com/resilience4j/resilience4j)
-- resilience4j (from https://resilience4j.readme.io)
-=======
 - resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://resilience4j.readme.io)
 - resilience4j (from https://github.com/resilience4j/resilience4j)
->>>>>>> b4a1fa79b20be9c429413db5f48ddacc46cedc26
 - rest (from https://github.com/elastic/elasticsearch)
 - rest-high-level (from https://github.com/elastic/elasticsearch)
 - rxjava (from https://github.com/ReactiveX/RxJava)