Merge branch 'fronkdev' into 'master'

RimoImport: Service Port DN: Treat SpliceBox like Shelf

See merge request fronk/thetool!1333

scripts/adb-rimo-import/rimo-import.php

@@ -893,5 +893,9 @@ function getServiceDnValues($dn)
         }
     }
 
+    if(!array_key_exists("Shelf", $fields) && array_key_exists("SpliceBox", $fields)) {
+        $fields['Shelf'] = $fields['SpliceBox'];
+    }
+
     return $fields;
 }