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 65d3b0d71c Add ResourceKeyConverterAdapter %!s(int64=4) %!d(string=hai) anos