Merge remote-tracking branch 'upstream/update-license-rules' into develop

Author: pombredanne

src/licensedcode/data/rules/cddl-1.0_or_gpl-2.0_with_classpath-exception-2.0_10.RULE

@@ -0,0 +1,10 @@
+---
+license_expression: cddl-1.0 OR gpl-2.0 WITH classpath-exception-2.0
+is_license_tag: yes
+ignorable_urls:
+    - https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
+---
+
+name: CDDL + GPLv2 with classpath exception
+url: https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html
+comments: A business-friendly OSS license

src/licensedcode/data/rules/cddl-1.0_or_gpl-2.0_with_classpath-exception-2.0_11.RULE

@@ -0,0 +1,10 @@
+---
+license_expression: cddl-1.0 OR gpl-2.0 WITH classpath-exception-2.0
+is_license_tag: yes
+ignorable_urls:
+    - https://github.com/javaee/javax.annotation/blob/master/LICENSE
+---
+
+name: CDDL + GPLv2 with classpath exception
+url: https://github.com/javaee/javax.annotation/blob/master/LICENSE
+comments: A business-friendly OSS license