fixed imports and Jenkins fix (build.xml)