This fixes the OSX travis-ci job for the Java8 update, and also two other fixes as described in the commit message. @CiaranG I think the /etc/profile approach in 7b466b62 gets us closer to the idea of having the fdroid build jobs run in the same environment as vagrant ssh.