Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 15371)
+++ /trunk/data/defaultpresets.xml	(revision 15372)
@@ -337,5 +337,5 @@
     </chunk>
     <chunk id="power_loc">
-        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop" values_context="power" />
+        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" />
     </chunk>
     <chunk id="power_extra">
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 15371)
+++ /trunk/data/validator/deprecated.mapcss	(revision 15372)
@@ -189,5 +189,19 @@
   fixAdd: "power=substation";
 }
-  
+
+*[location=rooftop] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "location=roof";
+  group: tr("deprecated tagging");
+  fixAdd: "location=roof";
+}
+
+*[generator:location=*] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "location";
+  group: tr("deprecated tagging");
+  fixChangeKey: "generator:location => location";
+}
+
 *[generator:method=dam] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
Index: /trunk/data/validator/ignoretags.cfg
===================================================================
--- /trunk/data/validator/ignoretags.cfg	(revision 15371)
+++ /trunk/data/validator/ignoretags.cfg	(revision 15372)
@@ -64,5 +64,12 @@
 E:hour_off
 E:tower:type
+E:icn
+E:ncn
+E:rcn
+E:lcn
+E:icn_ref
+E:ncn_ref
 E:rcn_ref
+E:lcn_ref
 E:place_name
 E:cycleway
Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 15371)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 15372)
@@ -296,5 +296,5 @@
     // WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
     private static final String[] GENERIC_TLDS = new String[] {
-        // Taken from Version 2019091200, Last Updated Thu Sep 12 07:07:02 2019 UTC
+        // Taken from Version 2019092301, Last Updated Tue Sep 24 07:07:01 2019 UTC
         "aaa", // aaa American Automobile Association, Inc.
         "aarp", // aarp AARP
@@ -544,4 +544,5 @@
         "coupons", // coupons Black Island, LLC
         "courses", // courses OPEN UNIVERSITIES AUSTRALIA PTY LTD
+        "cpa", // cpa American Institute of Certified Public Accountants
         "credit", // credit Snow Shadow, LLC
         "creditcard", // creditcard Binky Frostbite, LLC