Merge "Fix manual copy of lombok in the tools." into idea133