Merge remote-tracking branch 'origin/4.11' into 4.12

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 1fd4c4b..c37e236 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,12 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 sudo: required
-dist: trusty
+dist: xenial
 group: edge
 
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
 python:
   - "2.7"