merge 985966 from trunk - fix test failure by moving maven.compile.classpath setting outside of pathelement statement - thanks to Alexandros Karypidis for finding and resolving the issue