Rob Winch 670b71363d Merge branch '5.8.x' 3 lat temu
..
java 670b71363d Merge branch '5.8.x' 3 lat temu
resources 65d3b0d71c Add ResourceKeyConverterAdapter 4 lat temu