Branch 'SPACEWALK-1.3' - java/code