8060204: Fix warnings in Joni and testsReviewed-by: hannesw, sundar, attila
8021129: Use public lookup againReviewed-by: lagergren, sundar