Rob Winch 670b71363d Merge branch '5.8.x' %!s(int64=3) %!d(string=hai) anos
..
java 670b71363d Merge branch '5.8.x' %!s(int64=3) %!d(string=hai) anos
resources 5a0f1d51c3 Drop EhCache2 support %!s(int64=3) %!d(string=hai) anos