Merge "Add METADATA to jdiff: LGPL+GPL=RESTRICTED"