8060204: Fix warnings in Joni and testsReviewed-by: hannesw, sundar, attila
8009757: Package access clean up and refactoringReviewed-by: jlaskey, lagergren, attila