add changes from develop conflicts

README.md

@@ -6,6 +6,14 @@
 - Note on Pulsar topic: can't be nested so after the domain prefix change the / with @
   e.g: rest path like /domain/apiFamiliy/api1 will be in pubsub /domain/apiFamily@api1
    
+## 2.1.4
+- connect with undertow 2.0.28
+## 2.1.3
+- add date time to ILoggerConsoleImpl
+## 2.1.2
+- add config to okhttp client read/connect timeouts
+"microservice.http.client.read.timeout.seconds" (30)
+"microservice.http.client.connect.timeout.seconds" (10)
 
 ## 2.1.1 
 - downgrade metrics influxdb to fit the reporter on iot jar