Import java/java-subversion version 1.8.5
Tweak astro/mkgmap version r2724