Branch 'SPACEWALK-0.6' - 2 commits - java/code