Kluge to get deployment working against ot1, which is ubuntu, which doesn't change /etc/alternatives/java to Java 7
Merge remote-tracking branch 'upstream/master'