Fixing merge problem in test
Automatic commit of package [spacewalk-java] release [2.3.101-1].