Fixing merge problem and checkstyle for power management merge
Automatic commit of package [spacewalk-java] release [2.2.107-1].