Refine short Apache license rules and tests

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

src/licensedcode/data/rules/apache-2.0_1038.RULE

@@ -1 +1 @@
-Apache-2.0  Apache License 2.0
+Apache Public License

src/licensedcode/data/rules/apache-2.0_1038.yml

@@ -1,2 +1,4 @@
 license_expression: apache-2.0
 is_license_reference: yes
+is_continuous: yes
+relevance: 99

src/licensedcode/data/rules/apache-2.0_1040.RULE

@@ -1 +1 @@
-Apache License 2.0 Apache-2.0
+Apache Public Licence

src/licensedcode/data/rules/apache-2.0_1040.yml

@@ -1,6 +1,4 @@
 license_expression: apache-2.0
 is_license_reference: yes
 is_continuous: yes
-relevance: 100
-minimum_coverage: 100
-notes: Rule based on an SPDX license identifier and name
+relevance: 99

src/licensedcode/data/rules/apache-2.0_1042.RULE

@@ -1 +1 @@
-['APACHE', 'Apache-2.0'],
+Apache License Version 2.0 http://www.apache.org/licenses/LICENSE-2.0

src/licensedcode/data/rules/apache-2.0_1042.yml

@@ -2,4 +2,5 @@ license_expression: apache-2.0
 is_license_reference: yes
 is_continuous: yes
 relevance: 100
-minimum_coverage: 100
+ignorable_urls:
+    - http://www.apache.org/licenses/LICENSE-2.0

src/licensedcode/data/rules/apache-2.0_1043.RULE

@@ -1 +1 @@
-'APACHE-V2': 'Apache-2.0',
+Apache Public License v2

src/licensedcode/data/rules/apache-2.0_1043.yml

@@ -2,4 +2,3 @@ license_expression: apache-2.0
 is_license_reference: yes
 is_continuous: yes
 relevance: 100
-minimum_coverage: 100

src/licensedcode/data/rules/apache-2.0_1044.RULE

@@ -1 +1 @@
-'APACHE2': 'Apache-2.0',
+Apache Public Licence v2

src/licensedcode/data/rules/apache-2.0_1044.yml

@@ -2,4 +2,3 @@ license_expression: apache-2.0
 is_license_reference: yes
 is_continuous: yes
 relevance: 100
-minimum_coverage: 100