Merge "Refactor integration java jobs"