Add native6, OBS6 and RAWOBS rootpaths to metoffice config-user.yml …

…template, and remove temporary dir (#2432)

esmvalcore/config-user.yml

@@ -237,16 +237,21 @@ drs:
 #  CMIP5: /project/champ/data/cmip5/output1
 #  CMIP6: /project/champ/data/CMIP6
 #  CORDEX: /project/champ/data/cordex/output
-#  OBS: /data/users/esmval/ESMValTool/temporary/obs/
-#  obs4MIPs: /data/users/esmval/ESMValTool/temporary/obs/
+#  OBS: /data/users/esmval/ESMValTool/obs
+#  OBS6: /data/users/esmval/ESMValTool/obs
+#  obs4MIPs: /data/users/esmval/ESMValTool/obs
 #  ana4mips: /project/champ/data/ana4MIPs
+#  native6: /data/users/esmval/ESMValTool/rawobs
+#  RAWOBS: /data/users/esmval/ESMValTool/rawobs
 #drs:
 #  CMIP5: BADC
 #  CMIP6: BADC
 #  CORDEX: BADC
 #  OBS: default
+#  OBS6: default
 #  obs4MIPs: default
 #  ana4mips: BADC
+#  native6: default
 
 # Site-specific entries: NCI
 # Uncomment the lines below to locate data at NCI.