TRUNK-287

@dkayiwa Ok. Now it should really be OK :) 

mvn clean install results with BUILD SUCCESS locally.