Merge branch 'master' at M6 into 'OT_BETA_JAVA8'
+ fix compile errors in tests