From 3d183f67a5c48b57d51b7a21eab1eb49e593f08b Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 25 Apr 2013 10:13:05 +0000
Subject: [PATCH] CR-1582 Remove reference to old known issues (part2)

---
 opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter_tests.xml                          |   42 +-
 opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml                                   |    5 
 opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry_tests.xml                              |   42 +-
 opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis_tests.xml                                  |   52 ++--
 opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn_tests.xml                                  |   32 +-
 opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_defaultconf_tests.xml                          |   10 
 opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes_tests.xml                                    |   68 +++---
 opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml                            |    5 
 opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry_tests.xml                              |   58 ++--
 opends/tests/staf-tests/functional-tests/testcases/aci/target/target_tests.xml                                          |   62 ++--
 opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis_tests.xml                                |   33 +-
 opends/tests/staf-tests/shared/ant/build.xml                                                                            |   10 
 opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards_tests.xml                            |   42 +-
 opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml            |    6 
 opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml |   43 ---
 opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_customconf_tests.xml                           |   16 
 opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter_tests.xml                            |   38 +-
 opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict_tests.xml                              |   12 
 opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights_tests.xml                      |   38 +-
 19 files changed, 290 insertions(+), 324 deletions(-)

diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes_tests.xml
index da3cbaf..05e91fc 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -33,7 +33,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  Preamble
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test default aci settings
       #@TestPreamble              none
       #@TestStep                  Admin removes global search ACI
@@ -214,7 +214,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn equals one static group
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn equals one static group
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -416,7 +416,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn equals two static groups
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn equals two static groups
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -624,7 +624,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn not equals one static group
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn not equals one static group
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a different group member.
@@ -832,7 +832,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn not equals two static groups
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn not equals two static groups
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -1034,7 +1034,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn equals one dynamic group
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn equals one dynamic group
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -1236,7 +1236,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn equals two dynamic groups
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn equals two dynamic groups
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -1444,7 +1444,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn not equals one dynamic group
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn not equals one dynamic group
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a different group member.
@@ -1652,7 +1652,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn not equals two dynamic groups
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn not equals two dynamic groups
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -1854,7 +1854,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn equals one static group with wildcard
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn of a static group with a wildcard
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -2050,7 +2050,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn equals one static and one dynamic group
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn equals one static and one dynamic group
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -2258,7 +2258,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn - selfwrite add member
-      #@TestIssue                 450
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn - selfwrite add member
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Admin adds selfwrite aci to the dn of the group
@@ -2454,7 +2454,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn - selfwrite delete member
-      #@TestIssue                 450
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn - selfwrite delete member
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Admin adds selfwrite aci to the dn of the group
@@ -2625,7 +2625,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn - selfwrite replace member
-      #@TestIssue                 450
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn - selfwrite replace member
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Admin adds selfwrite aci to the dn of the group
@@ -2798,7 +2798,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  groupdn - selfwrite add description
-      #@TestIssue                 450
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn - selfwrite add description
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Admin adds selfwrite aci to the dn of the group
@@ -2972,7 +2972,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  userattr equals one attribute
-      #@TestIssue                 455
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with userattr equals one attribute
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn for all attributes.
@@ -3223,7 +3223,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  userattr not equals one attribute
-      #@TestIssue                 1587
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with userattr not equals one attribute
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn for all attributes.
@@ -3498,7 +3498,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  userattr equals one attribute with bindtype
-      #@TestIssue                 455
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with userattr equals one attr with bindtype
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn for entry with matching manager.
@@ -3681,7 +3681,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  userattr equals one attr with groupdn
-      #@TestIssue                 455
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with userattr equals one attr with groupdn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn for entry with group member and matching manager.
@@ -3889,7 +3889,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  userattr equals one attr with groupdn, url expression
-      #@TestIssue                 455
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with userattr equals groupdn with url expression
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn for entry with group member and matching manager.
@@ -4052,7 +4052,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  inheritance with bindtype, deny children
-      #@TestIssue                 455
+      #@TestIssue                 none
       #@TestPurpose               Test behavior of inheritance with bindtype, deny children
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn for entry with children, parent.
@@ -4258,7 +4258,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  inheritance with bindtype, allow one child level
-      #@TestIssue                 455
+      #@TestIssue                 none
       #@TestPurpose               Test behavior of inheritance with bindtype, allow one child level
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn for entry with children, parent.
@@ -4463,7 +4463,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Bind Type Tests
     #@TestName                  inheritance with bindtype, allow two child levels
-    #@TestIssue                 455
+    #@TestIssue                 none
     #@TestPurpose               Test behavior of inheritance with bindtype, allow two child levels
     #@TestPreamble              Admin adds an aci to the dn of one existing branch.
     #@TestStep                  Client searches entry in the targeted branch dn for entry with children, parent.
@@ -4668,7 +4668,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  userattr equals one operational attribute with bindtype
-      #@TestIssue                 1760
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with userattr equals one operational attr with bindtype
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn for entry with matching userdn.
@@ -4833,7 +4833,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  syntax - groupdn with missing slash
-      #@TestIssue                 455
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn with missing slash in the url
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -4893,7 +4893,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  syntax - groupdn with single quotes
-      #@TestIssue                 455
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn with single quotes
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -4953,7 +4953,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  syntax - groupdn is null
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with groupdn equals null
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -5013,7 +5013,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  syntax - userdn is null
-      #@TestIssue                 453
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with userdn equals null
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -5073,7 +5073,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  syntax - userattr is null
-      #@TestIssue                 455
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with userattr equals null
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -5133,7 +5133,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  syntax - roledn
-      #@TestIssue                 1577
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with roledn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -5194,7 +5194,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Bind Type Tests
       #@TestName                  userdn with filter
-      #@TestIssue                 454
+      #@TestIssue                 none
       #@TestPurpose               Test behavior with userdn and filter
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry in the targeted branch dn as a group member.
@@ -5353,7 +5353,7 @@
   The tag, TestMarker, must be the same as the tag, TestSuiteName.
   #@TestMarker                ACI Bind Type Tests
   #@TestName                  authmethod equals none
-  #@TestIssue                 460
+  #@TestIssue                 none
   #@TestPurpose               Test bind where an ACI authmethod equals none applies.
   #@TestPreamble              none
   #@TestStep                  Anonymous search.
@@ -5499,7 +5499,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Bind Type Tests
         #@TestName                  Postamble
-        #@TestIssue                 454
+        #@TestIssue                 none
         #@TestPurpose               Reset environment.
         #@TestPreamble              none
         #@TestStep                  Admin removes entries.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry_tests.xml
index 469f84f..db0eedf 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -33,7 +33,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Delete Entry Tests
         #@TestName                  Preamble
-        #@TestIssue                 442
+        #@TestIssue                 none
         #@TestPurpose               Test default aci settings
         #@TestPreamble              none
         #@TestStep                  Add extra entries that will be deleted in the tests.
@@ -119,7 +119,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - userdn equals all
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Delete an entry
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an entry in the targeted branch.
@@ -251,7 +251,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry  - userdn equals a dn
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Delete an entry
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an entry in the targeted branch.
@@ -398,7 +398,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry  - userdn not equals a dn
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Delete an entry
       #@TestPreamble              Admin adds an aci with the target not equal to the dn of one existing branch.
       #@TestStep                  Client deletes an entry in the targeted branch.
@@ -545,7 +545,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - delete not allowed
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Delete an entry when delete is not allowed
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an entry in the targeted branch.
@@ -648,7 +648,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - targetfilter with one statement
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with ACI that has targetfilter with one statement 
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an entry with the targeted branch.
@@ -780,7 +780,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - targetfilter with three statements (or) all false
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with ACI that has targetfilter with three statements (or) all false 
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an entry with the targeted branch.
@@ -897,7 +897,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - targetfilter not equals three statements (or) all false
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with ACI that has targetfilter not equal three statements (or) all false 
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an entry in the targeted branch.
@@ -1013,7 +1013,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - targetfilter with three statements (and) all true
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with ACI that has targetfilter with three statements (and) all true 
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an entry in the targeted branch.
@@ -1129,7 +1129,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - targetfilter contains attribute not present
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with ACI that has targetfilter containing attribute not present
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an entry in the targeted branch.
@@ -1249,7 +1249,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - targetattr equals three attributes
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with ACI that has targetattr equal to three attributes
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an entry in the targeted branch.
@@ -1365,7 +1365,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - targetattr equals attribute not present
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with ACI that has targetattr equal to attribute not present
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an entry in the targeted branch.
@@ -1482,7 +1482,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - targattrfilter equals attr value
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with ACI that has targattrfilter equals attribute value
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client deletes an entry in the targeted branch.
@@ -1598,7 +1598,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - delete branch
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Delete a branch
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes a branch in the targeted branch.
@@ -1744,7 +1744,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - Multi ACIs 1, overall deny
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with 2 ACIs, overall deny  
       #@TestPreamble              Admin adds two acis.
       #@TestStep                  Client deletes an entry with the targeted branch.
@@ -1861,7 +1861,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - Multi ACIs 2, overall allow
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with 2 ACIs, overall allow  
       #@TestPreamble              Admin adds two acis.
       #@TestStep                  Client deletes an entry with the targeted branch.
@@ -1977,7 +1977,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - Multi ACIs 3, mixed allow and deny
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with 2 ACIs, mixed allow and deny  
       #@TestPreamble              Admin adds two acis.
       #@TestStep                  Client deletes an entry with the targeted branch by a prohibited userdn.
@@ -2108,7 +2108,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - Multi ACIs 4, overall allow with many ACIs
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with many ACIs, overall allow with many ACIs  
       #@TestPreamble              Admin adds two acis.
       #@TestStep                  Client deletes an entry with the targeted branch.
@@ -2224,7 +2224,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Delete Entry Tests
       #@TestName                  Delete Entry - Multi ACIs 5, mixed allow and deny with many ACIs
-      #@TestIssue                 442
+      #@TestIssue                 none
       #@TestPurpose               Test delete with many ACIs, mixed allow and deny with many ACIs  
       #@TestPreamble              Admin adds many acis, mixed allow and deny with many ACIs.
       #@TestStep                  Client deletes an entry with the targeted branch by a prohibited userdn.
@@ -2355,7 +2355,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Delete Entry Tests
         #@TestName                  Postamble
-        #@TestIssue                 442
+        #@TestIssue                 none
         #@TestPurpose               Test default aci settings
         #@TestPreamble              none
         #@TestStep                  Directory Manager searches entry in a branch.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights_tests.xml
index 11abaee..cac16b2 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -33,7 +33,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Preamble
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Prepare for effective rights tests
       #@TestPreamble              none
       #@TestStep                  Admin removes global search ACI
@@ -120,7 +120,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - wildcard 
-      #@TestIssue                 1745
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with wildcard
       #@TestPreamble              none
       #@TestStep                  Admin searches for effective rights in an entry using the wildcard notation.
@@ -206,7 +206,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - read 
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with read permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Admin searches for effective rights in an entry in the targeted branch dn.
@@ -368,7 +368,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - search 
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with search permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -530,7 +530,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - search-read 
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with search-read permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -751,7 +751,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - search-read in separate ACIs
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with search-read permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -914,7 +914,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - compare
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with compare permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -1077,7 +1077,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - add
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with add permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -1246,7 +1246,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - delete
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with delete permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -1415,7 +1415,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - write
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with write permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -1584,7 +1584,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - proxy
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with proxy permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -1753,7 +1753,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - selfwrite
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with selfwrite permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -1922,7 +1922,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - all
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with all permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -2091,7 +2091,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - export
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with export permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -2254,7 +2254,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - import
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with import permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -2417,7 +2417,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - targetattr with search,read
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with targetattr with search,read permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -2581,7 +2581,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Effective Rights Tests
       #@TestName                  Effective Rights - targetattr with search,read
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Test effective rights with targetattr with search,read permission
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -2745,7 +2745,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Postamble
-      #@TestIssue                 87
+      #@TestIssue                 none
       #@TestPurpose               Reset effective rights tests
       #@TestPreamble              none
       #@TestStep                  Admin deletes ACI to access effective rights
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis_tests.xml
index 5e178c0..55ac9fc 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis_tests.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
                               
@@ -32,7 +33,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Search
-      #@TestIssue                 1402
+      #@TestIssue                 none
       #@TestPurpose               Search against default global acis
       #@TestPreamble              none
       #@TestStep                  Client searches entry.
@@ -111,7 +112,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Search - One operational attribute for one entry
-      #@TestIssue                 1622
+      #@TestIssue                 none
       #@TestPurpose               Search one operational attribute for one entry against default global acis
       #@TestPreamble              none
       #@TestStep                  Client searches one operational attribute of an entry.
@@ -183,7 +184,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Search - All operational attributes for one entry
-      #@TestIssue                 1622
+      #@TestIssue                 none
       #@TestPurpose               Search all operational attributes for one entry against default global acis
       #@TestPreamble              Admin modify entry so there are modifyTimestamp and modifiersName attributes
       #@TestStep                  Client searches all operational attributes of an entry.
@@ -297,7 +298,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Search - One operational attribute for cn=schema
-      #@TestIssue                 1622
+      #@TestIssue                 none
       #@TestPurpose               Search one operational attribute for cn=schema against default global acis
       #@TestPreamble              none
       #@TestStep                  Client searches one operational attribute of cn=schema.
@@ -370,7 +371,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Search - All operational attributes for cn=schema
-      #@TestIssue                 1622
+      #@TestIssue                 none
       #@TestPurpose               Search all operational attributes for cn=schema against default global acis
       #@TestPreamble              none
       #@TestStep                  Client searches all operational attributes of cn=schema.
@@ -473,7 +474,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Search - One operational attribute for root dse
-      #@TestIssue                 1622
+      #@TestIssue                 none
       #@TestPurpose               Search one operational attribute for root dse against default global acis
       #@TestPreamble              none
       #@TestStep                  Client searches one operational attribute of root dse.
@@ -546,7 +547,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Search - All operational attributes for root dse
-      #@TestIssue                 1622
+      #@TestIssue                 none
       #@TestPurpose               Search all operational attributes for root dse against default global acis
       #@TestPreamble              none
       #@TestStep                  Client searches all operational attributes of root dse.
@@ -661,7 +662,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Search - All operational attributes for cn=config
-      #@TestIssue                 1622
+      #@TestIssue                 none
       #@TestPurpose               Search all operational attributes for cn=config against default global acis
       #@TestPreamble              none
       #@TestStep                  Client searches all operational attributes for cn=config.
@@ -718,7 +719,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Search - Anonymous
-      #@TestIssue                 1621
+      #@TestIssue                 none
       #@TestPurpose               Anonymous search against default global acis
       #@TestPreamble              none
       #@TestStep                  Client searches entry as anonymous.
@@ -795,7 +796,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Search - Anonymous with not equals filter
-      #@TestIssue                 1621
+      #@TestIssue                 none
       #@TestPurpose               Anonymous search with not equals filter against default global acis
       #@TestPreamble              none
       #@TestStep                  Client searches entry as anonymous with not equals filter
@@ -873,7 +874,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Compare
-      #@TestIssue                 1402
+      #@TestIssue                 none
       #@TestPurpose               Compare against default global acis
       #@TestPreamble              none
       #@TestStep                  Client compares attribute in an entry.
@@ -937,7 +938,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Modify
-      #@TestIssue                 1402
+      #@TestIssue                 none
       #@TestPurpose               Modify against default global acis
       #@TestPreamble              none
       #@TestStep                  Client modifies attribute in an entry.
@@ -992,7 +993,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Delete
-      #@TestIssue                 1402
+      #@TestIssue                 none
       #@TestPurpose               Delete against default global acis
       #@TestPreamble              none
       #@TestStep                  Client deletes an entry.
@@ -1047,7 +1048,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Modify RDN
-      #@TestIssue                 1402
+      #@TestIssue                 none
       #@TestPurpose               Modify RDN against default global acis
       #@TestPreamble              none
       #@TestStep                  Client modifies the RDN of an entry.
@@ -1102,7 +1103,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Modify Self
-      #@TestIssue                 1402
+      #@TestIssue                 none
       #@TestPurpose               Modify self against default global acis
       #@TestPreamble              none
       #@TestStep                  Client modifies allowed attribute in the user entry.
@@ -1155,7 +1156,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Global Tests
       #@TestName                  Global ACI Modify Self
-      #@TestIssue                 1402
+      #@TestIssue                 none
       #@TestPurpose               Modify self against default global acis
       #@TestPreamble              none
       #@TestStep                  Client modifies denied attribute in the user entry.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry_tests.xml
index 5c16e0c..6ad2e56 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
        
@@ -33,7 +33,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Entry Tests
         #@TestName                  Preamble
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               Add additional entries
         #@TestPreamble              none
         #@TestStep                  Directory Manager adds additional entries.
@@ -89,7 +89,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - userdn equals all
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modifies an attribute with targetattr=* and userdn =all
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -205,7 +205,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - targetattr equals three attributes
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify an attribute where targetattr equals three attributes
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -336,7 +336,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - targetattr not equals three attributes
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify an attribute with targetattr not equals three attributes
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -467,7 +467,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - write not allowed
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify an attribute where write is not allowed
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -599,7 +599,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - targetattr and targattrfilters 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify an attribute with a combination of targetattr and targattrfilters
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -760,7 +760,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - targetfilter with three statements with or, one statement true
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify an attribute with targetfilter with three statements with or, one statement true
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -891,7 +891,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - targetfilter not equals three statements with and, all statements true 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify an attribute with targetfilter not equals three statements with and, all statements true
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -1021,7 +1021,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - multiple ACIs 1, overall deny
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify attribute value with 2 ACIs, overall deny  
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -1139,7 +1139,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - multiple ACIs 2, overall allow 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify attribute value with 2 ACIs, overall allow 
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -1255,7 +1255,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - multiple ACIs 3, mixed allow and deny 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify attribute value with 2 ACIs, mixed allow and deny by userdn 
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry by a prohibited user in the targeted branch.
@@ -1386,7 +1386,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - multiple ACIs 4, overall allow with many ACIs 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify attribute value with many ACIs, overall allow with many ACIs 
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -1502,7 +1502,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Modify Attribute Value - multiple ACIs 5, mixed allow and deny with many ACIs 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Modify attribute value with many ACIs, mixed allow and deny with many ACIs
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry by a prohibited user in the targeted branch.
@@ -1634,7 +1634,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Delete Attribute Value - userdn equals dn
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Deletes an attribute from an entry where targetattr=* and userdn=[a dn]
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an attribute value with a prohibited user in an entry in the targeted branch.
@@ -1765,7 +1765,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Delete Attribute Value - targetattr equals one attribute
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Delete an attribute with targetattr equals one attribute
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an attribute value in an entry in the targeted branch.
@@ -1896,7 +1896,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Delete Attribute Value - targetattr not equals one attribute
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Delete an attribute with targetattr not equals one attribute
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an attribute value in an entry in the targeted branch.
@@ -2027,7 +2027,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Delete Attribute Value - write not allowed
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Deletes an attribute where write is not allowed
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an attribute value in an entry in the targeted branch.
@@ -2159,7 +2159,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Delete Attribute Value - targetattr and targattrfilter 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Delete an attribute with a combination of targetattr and targattrfilter
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an attribute value in an entry in the targeted branch.
@@ -2316,7 +2316,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Entry Tests
         #@TestName                  Delete Attribute Value - targetfilter with three statements with or, none true
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               Delete an attribute with targetfilter with three statements with or, none true
         #@TestPreamble              Admin adds an aci to the dn of one existing branch.
         #@TestStep                  Client deletes an attribute value in an entry in the targeted branch.
@@ -2433,7 +2433,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Delete Attribute Value - targetfilter equals three statements with and, all statements false 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Delete an attribute with targetfilter equals three statements with and, all statements false
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client deletes an attribute value in an entry in the targeted branch.
@@ -2551,7 +2551,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Add Attribute Value - userdn not equals dn
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Adds an attribute to an entry with targetattr=* and userdn not equals to a dn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an attribute with a prohibited user in an entry in the targeted branch.
@@ -2682,7 +2682,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Add Attribute Value - targetattr equals one attribute not present
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Add an attribute value to an entry with targetattr equals one attribute not present
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an attribute in an entry in the targeted branch.
@@ -2813,7 +2813,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Add Attribute Value - targetattr not equals attribute, add multi-values
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Add multi-valued attribute to an entry with targetattr not equals attribute, add multi-values
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an attribute value in an entry in the targeted branch.
@@ -2957,7 +2957,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Add Attribute Value - write not allowed
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Adds an attribute value where write is not allowed
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an attribute value in an entry in the targeted branch.
@@ -3089,7 +3089,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Add Attribute Value - targetattr and targattrfilter 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Add an attribute value with a combination of targetattr and targattrfilter
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an attribute value in an entry in the targeted branch.
@@ -3248,7 +3248,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Entry Tests
         #@TestName                  Add Attribute Value - targetfilter not equals three statements with or, none true
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               Add an attribute value with targetfilter not equals three statements with or, none true
         #@TestPreamble              Admin adds an aci to the dn of one existing branch.
         #@TestStep                  Client adds an attribute value in an entry in the targeted branch.
@@ -3363,7 +3363,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Add Attribute Value - targetfilter equals three statements with and, all statements false 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Add an attribute with targetfilter equals three statements with and, all statements false
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an attribute value in an entry in the targeted branch.
@@ -3480,7 +3480,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Modify Entry Tests
     #@TestName                  Postamble
-    #@TestIssue                 444
+    #@TestIssue                 none
     #@TestPurpose               Remove entries
     #@TestPreamble              none
     #@TestStep                  Directory Manager removes entries that were used for testing.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter_tests.xml
index a7fe43d..8a030f2 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -33,7 +33,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 1 - targetattr equals wildcard, targattrfilters equal add and del
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(l=Sunny*),del=l:(l=Sunny*) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -250,7 +250,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 2 - targetattr equals wildcard, targattrfilters equal add and del both with not equal [filter]
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(!(l=Sunny*)) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -475,7 +475,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 3 - targetattr equals wildcard, targattrfilters equal add and del, both with not equal [filter] and no match
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(!(l=Anythingelse*)),del=l:(!(l=Anythingelse*)) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -688,7 +688,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 4 - targetattr equals wildcard, targattrfilters equal add and del, both with not equal [filter] and no match
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(l=Anythingelse*),del=l:(l=Anythingelse*) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -915,7 +915,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 5 - targetattr equals wildcard, targattrfilters equal add and del, add with not equal [filter] 
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(l=Sunny*) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -1132,7 +1132,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 6 - targetattr equals wildcard, targattrfilters equal add and del, del with not equal [filter] 
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= * )(targattrfilters= add=l:(l=Sunny*),del=l:(!(l=Sunny*)) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -1357,7 +1357,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 11 - targetattr equals l, targattrfilters equal add and del
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(l=Sunny*),del=l:(l=Sunny*) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -1580,7 +1580,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 12 - targetattr equals l, targattrfilters equal add and del both with not equal [filter]
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(!(l=Sunny*)) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -1811,7 +1811,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 13 - targetattr equals l, targattrfilters equal add and del, both with not equal [filter] and no match
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(!(l=Anythingelse*)),del=l:(!(l=Anythingelse*)) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -2030,7 +2030,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 14 - targetattr equals l, targattrfilters equal add and del, both with not equal [filter] and no match
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(l=Anythingelse*),del=l:(l=Anythingelse*) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -2263,7 +2263,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 15 - targetattr equals l, targattrfilters equal add and del, add with not equal [filter] 
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(l=Sunny*) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -2486,7 +2486,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 16 - targetattr equals l, targattrfilters equal add and del, del with not equal [filter] 
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= l )(targattrfilters= add=l:(l=Sunny*),del=l:(!(l=Sunny*)) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -2717,7 +2717,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 21 - targetattr equals carlicense, targattrfilters equal add and del
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(l=Sunny*),del=l:(l=Sunny*) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -2934,7 +2934,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 22 - targetattr equals carlicense, targattrfilters equal add and del both with not equal [filter]
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(!(l=Sunny*)) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -3159,7 +3159,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 23 - targetattr equals carlicense, targattrfilters equal add and del, both with not equal [filter] and no match
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(!(l=Anythingelse*)),del=l:(!(l=Anythingelse*)) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -3372,7 +3372,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 24 - targetattr equals carlicense, targattrfilters equal add and del, both with not equal [filter] and no match
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(l=Anythingelse*),del=l:(l=Anythingelse*) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -3599,7 +3599,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 25 - targetattr equals carlicense, targattrfilters equal add and del, add with not equal [filter] 
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(!(l=Sunny*)),del=l:(l=Sunny*) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
@@ -3816,7 +3816,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Modify Filter Tests
         #@TestName                  ACI 26 - targetattr equals carlicense, targattrfilters equal add and del, del with not equal [filter] 
-        #@TestIssue                 444
+        #@TestIssue                 none
         #@TestPurpose               (targetattr= carlicense )(targattrfilters= add=l:(l=Sunny*),del=l:(!(l=Sunny*)) )
         #@TestPreamble              Directory Manager adds ACI and adds entries to test
         #@TestStep                  For entry 0, delete entire entry
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn_tests.xml
index e98901c..da8bea6 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
                                   
@@ -33,7 +33,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify RDN Tests
       #@TestName                  Preamble
-      #@TestIssue                 445
+      #@TestIssue                 none
       #@TestPurpose               Add additional entries
       #@TestPreamble              none
       #@TestStep                  Directory Manager adds additional entries.
@@ -88,7 +88,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify RDN Tests
       #@TestName                  Leaf - targetattr=* and userdn=all
-      #@TestIssue                 445
+      #@TestIssue                 none
       #@TestPurpose               Modifies an rdn of a leaf with targetattr=* and userdn=all
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies the rdn of an entry in the targeted branch.
@@ -249,7 +249,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify RDN Tests
       #@TestName                  Branch - targetattr=* and userdn=all
-      #@TestIssue                 445
+      #@TestIssue                 none
       #@TestPurpose               Modifies an rdn of a branch with targetattr=* and userdn=all
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies the rdn of an entry in the targeted branch.
@@ -423,7 +423,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Modify Entry Tests
     #@TestName                  Leaf - targetattr equals three attributes with uid
-    #@TestIssue                 445                
+    #@TestIssue                 none                
     #@TestPurpose               Modify an rdn where targetattr equals three attributes with uid
     #@TestPreamble              Admin adds an aci to the dn of one existing branch.
     #@TestStep                  Client modifies the rdn of an entry in the targeted branch.
@@ -584,7 +584,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Modify Entry Tests
     #@TestName                  Leaf - targetattr equals three attributes without uid
-    #@TestIssue                 445                
+    #@TestIssue                 none                
     #@TestPurpose               Modify an rdn where targetattr equals three attributes without uid
     #@TestPreamble              Admin adds an aci to the dn of one existing branch.
     #@TestStep                  Client modifies an rdn of an entry in the targeted branch.
@@ -702,7 +702,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Branch - targetattr with three attributes equals ou
-      #@TestIssue                 445                
+      #@TestIssue                 none                
       #@TestPurpose               Modify an attribute where targetattr equals equals ou
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies the rdn of an entry in the targeted branch.
@@ -876,7 +876,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Branch - targetattr with three attributes not equals ou
-      #@TestIssue                 445                
+      #@TestIssue                 none                
       #@TestPurpose               Modify an attribute where targetattr with three attributes not equals ou
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an attribute value in an entry in the targeted branch.
@@ -993,7 +993,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify RDN Tests
       #@TestName                  Leaf - Multi ACIs, allow and deny
-      #@TestIssue                 445
+      #@TestIssue                 none
       #@TestPurpose               Modifies an rdn of a leaf with some entries allowed and some entries denied
       #@TestPreamble              Admin adds multiple acis.
       #@TestStep                  Client modifies the rdn of an entry in the targeted branch.
@@ -1169,7 +1169,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify RDN Tests
       #@TestName                  Branch - Multi ACIs, deny write on new branch
-      #@TestIssue                 445
+      #@TestIssue                 none
       #@TestPurpose               Modifies an rdn of a branch where new branch has a deny write
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies the rdn of an entry in the targeted branch.
@@ -1371,7 +1371,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify Entry Tests
       #@TestName                  Leaf - targetattr with three attributes not equals uid, delete old rdn
-      #@TestIssue                 445                
+      #@TestIssue                 none                
       #@TestPurpose               Modify an rdn where targetattr with three attributes not equals uid, delete old rdn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies an rdn of an entry in the targeted branch.
@@ -1489,7 +1489,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify RDN Tests
       #@TestName                  Leaf - targetattr with three attributes not equals uid, don't delete old rdn
-      #@TestIssue                 445
+      #@TestIssue                 none
       #@TestPurpose               Modifies an rdn of an entry with targetattr with three attributes not equals uid, don't delete old rdn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies the rdn of an entry in the targeted branch.
@@ -1650,7 +1650,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify RDN Tests
       #@TestName                  Leaf - targetattr with three attributes not equals sn and cn, dont delete old rdn
-      #@TestIssue                 445
+      #@TestIssue                 none
       #@TestPurpose               Modifies an rdn of an entry with  leaf with targetattr with three attributes not equals sn and cn, dont delete old rdn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies the rdn of an entry in the targeted branch.
@@ -1769,7 +1769,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify RDN Tests
       #@TestName                  Branch - Multi ACIs, targattrfilters add:ou, del:ou
-      #@TestIssue                 445
+      #@TestIssue                 none
       #@TestPurpose               Modifies an rdn of a branch where targattrfilters add:ou, del:ou
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies the rdn of an entry in the targeted branch.
@@ -1943,7 +1943,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Modify RDN Tests
       #@TestName                  Branch - Multi ACIs, targattrfilters add:ou, del:ou 2
-      #@TestIssue                 445
+      #@TestIssue                 none
       #@TestPurpose               Modifies an rdn of a branch where targattrfilters add:ou, del:ou
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client modifies the rdn of an entry in the targeted branch.
@@ -2145,7 +2145,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Modify RDN Tests
     #@TestName                  Postamble
-    #@TestIssue                 445
+    #@TestIssue                 none
     #@TestPurpose               Remove entries
     #@TestPreamble              none
     #@TestStep                  Directory Manager removes entries that were used for testing.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis_tests.xml
index eb77467..c192184 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -33,7 +33,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests
       #@TestName                  Preamble
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Prepare for multiple ACI test cases
       #@TestPreamble              none
       #@TestStep                  Directory Manager adds extra entries
@@ -149,7 +149,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters, one aci-one entry
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters, one aci-one entry
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should be allowed in targeted branch.
@@ -339,7 +339,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters, one aci-two entries 1
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters, one aci-two entries, same attribute
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should be allowed in targeted branch.
@@ -547,7 +547,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                Multiple ACI Tests 
         #@TestName                  Different targetfilters, one aci-two entries 2
-        #@TestIssue                 446
+        #@TestIssue                 none
         #@TestPurpose               Test three ACIs, different targetfilters, one aci-two entries, two attributes with not equal
         #@TestPreamble              Admin adds three ACIs.
         #@TestStep                  Client searches entry which should be allowed in targeted branch.
@@ -755,7 +755,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters, one aci-two entries 3
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters, one aci-two entries, with two attributes with equal
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should be allowed in targeted branch.
@@ -963,7 +963,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters, one aci-one entry, deny
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters, one aci-one entry, deny
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should not be allowed in targeted branch.
@@ -1134,7 +1134,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters, one aci-two entries 1, deny 
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters, one aci-two entries, same attribute, deny
       #@TestPreamble              Admin adds three ACIs, different targetfilters, two statements true with same attrs.
       #@TestStep                  Client searches entry which should not be allowed in targeted branch.
@@ -1305,7 +1305,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters, one aci-two entries 2, deny 
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters, one aci-two entries, two attributes with not equal, deny
       #@TestPreamble              Admin adds three ACIs, different targetfilters, two statements true with, two attributes with not equal, deny
       #@TestStep                  Client searches entry which should not be allowed in targeted branch.
@@ -1476,7 +1476,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters, one aci-two entries 3, deny
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters, one aci-two entries, with two attributes with equal, deny
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should be allowed in targeted branch.
@@ -1666,7 +1666,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters and targetattr
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters, one aci-two entries, same attribute
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should be allowed in targeted branch.
@@ -1874,7 +1874,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters and targeattr, deny one attr
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters, one aci-two entries, two attributes with not equal
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should be allowed in targeted branch.
@@ -2082,7 +2082,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters and targetattr with not equals
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters and targetattr with not equals
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should be allowed in targeted branch.
@@ -2294,7 +2294,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters and targetattr, separate search-read with missing read
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters and targetattr, separate search-read with missing read
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should not be allowed in targeted branch.
@@ -2490,7 +2490,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters and targetattr, separate search-read 
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters and targetattr, separate search-read 
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should be allowed in targeted branch.
@@ -2698,7 +2698,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests 
       #@TestName                  Different targetfilters and targetattr, separate search-read with deny search
-      #@TestIssue                 446
+      #@TestIssue                 none
       #@TestPurpose               Test three ACIs, different targetfilters and targetattr, separate search-read with deny search
       #@TestPreamble              Admin adds three ACIs.
       #@TestStep                  Client searches entry which should not be allowed in targeted branch.
@@ -2888,7 +2888,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests
       #@TestName                  Separate targattrfilters with add:l and del:l
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Test with separate targattrfilters
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -3019,7 +3019,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests
       #@TestName                  Separate targattrfilters with deny add:l and allow del:l
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Test with separate targattrfilters
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -3151,7 +3151,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests
       #@TestName                  Separate targattrfilters with allow add:l and deny del:l
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Test with separate targattrfilters
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -3283,7 +3283,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                Multiple ACI Tests
     #@TestName                  Separate targetattrs
-    #@TestIssue                 444
+    #@TestIssue                 none
     #@TestPurpose               Test with separate targetattrs
     #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
     #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -3413,7 +3413,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests
       #@TestName                  Separate targetattrs with not equals 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Test with separate targetattrs
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -3540,7 +3540,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests
       #@TestName                  Separate targetattrs and targattrfilters with equals and not equals 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Test with separate targetattrs
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -3686,7 +3686,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests
       #@TestName                  Separate targetattrs and targattrfilters with not equals 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Test with separate targetattrs
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -3832,7 +3832,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests
       #@TestName                  Separate targetattrs and targattrfilters with deny 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Test with separate targetattrs
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -3977,7 +3977,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                Multiple ACI Tests
       #@TestName                  Separate targetattrs with deny and targattrfilters 
-      #@TestIssue                 444
+      #@TestIssue                 none
       #@TestPurpose               Test with separate targetattrs
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -4124,7 +4124,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                Multiple ACI Tests
     #@TestName                  Postamble
-    #@TestIssue                 446
+    #@TestIssue                 none
     #@TestPurpose               Reset global ACI to default settings
     #@TestPreamble              none
     #@TestStep                  Client searches entry in one branch.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards_tests.xml
index 9cb9c43..fe7d50a 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
   
@@ -33,7 +33,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI RDN Wildcard Tests
         #@TestName                  Preamble
-        #@TestIssue                 445
+        #@TestIssue                 none
         #@TestPurpose               Add additional entries
         #@TestPreamble              none
         #@TestStep                  Directory Manager adds additional entries.
@@ -165,7 +165,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test whole-type wildcard for single entry
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -288,7 +288,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test whole-type wildcard for several entries
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, several entries, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -425,7 +425,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test whole-type wildcard for several entries, shorthand
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name with shorthand, several entries, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -562,7 +562,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test whole-rdn wildcard for single entry
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -686,7 +686,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test whole-rdn wildcard for single entry, two level allow
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -810,7 +810,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test multiple-whole-rdn wildcard for single entry, two level deny
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -934,7 +934,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test whole-rdn wildcard for single entry, two level deny
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -1058,7 +1058,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test multiple-whole-rdn wildcard for single entry, three level deny
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -1182,7 +1182,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test whole-rdn wildcard for single entry, three level deny
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -1306,7 +1306,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test whole-type and multiple-whole-rdn wildcard for several entries, shorthand
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name with shorthand, several entries, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -1442,7 +1442,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test several multiple-whole-rdn wildcards for single entry, three level deny
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -1566,7 +1566,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test several multiple-whole-rdn wildcards with bad branch
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -1690,7 +1690,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test multiple-whole-rdn wildcard syntax, multiple spaces
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -1814,7 +1814,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI RDN Wildcard Tests
       #@TestName                  Test multiple-whole-rdn wildcard syntax, extra internal space
-      #@TestIssue                 1379
+      #@TestIssue                 none
       #@TestPurpose               Target set equal to a dn with multiple-whole-rdn wildcard syntax, extra internal space
       #@TestPreamble              none
       #@TestStep                  Admin adds an aci to the dn of one existing branch.
@@ -1874,7 +1874,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI RDN Wildcard Tests
     #@TestName                  Test multiple-whole-rdn wildcard syntax, extra wildcard
-    #@TestIssue                 1379
+    #@TestIssue                 none
     #@TestPurpose               Target set equal to a dn with wmultiple-whole-rdn wildcard syntax, extra wildcard
     #@TestPreamble              none
     #@TestStep                  Admin adds an aci to the dn of one existing branch.
@@ -1934,7 +1934,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI RDN Wildcard Tests
     #@TestName                  Test usrdn syntax, single wildcard for branch
-    #@TestIssue                 1379
+    #@TestIssue                 none
     #@TestPurpose               Target set equal to a dn with single wildcard in branch name, deny
     #@TestPreamble              none
     #@TestStep                  Admin adds an aci to the dn of one existing branch.
@@ -1994,7 +1994,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI RDN Wildcard Tests
     #@TestName                  Test usrdn syntax, double wildcard notation for branch
-    #@TestIssue                 1379
+    #@TestIssue                 none
     #@TestPurpose               Target set equal to a dn with double wildcard notation, deny
     #@TestPreamble              none
     #@TestStep                  Admin adds an aci to the dn of one existing branch.
@@ -2054,7 +2054,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI RDN Wildcard Tests
     #@TestName                  Test usrdn syntax, wildcard notation for uid
-    #@TestIssue                 1379
+    #@TestIssue                 none
     #@TestPurpose               Target set equal to a dn with wildcard as attribute name, deny
     #@TestPreamble              Admin adds an aci to the dn of one existing branch.
     #@TestStep                  Client searches entry with the targeted branch dn.
@@ -2204,7 +2204,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Modify RDN Tests
     #@TestName                  Postamble
-    #@TestIssue                 1379
+    #@TestIssue                 none
     #@TestPurpose               Remove entries
     #@TestPreamble              none
     #@TestStep                  Directory Manager removes entries that were used for testing.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter_tests.xml
index 8d6da18..0ef913e 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
                       
@@ -33,7 +33,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targattrfilter Tests
         #@TestName                  Preamble
-        #@TestIssue                 437
+        #@TestIssue                 none
         #@TestPurpose               Test default aci settings
         #@TestPreamble              none
         #@TestStep                  Client searches entry with a branch dn.
@@ -136,7 +136,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter equals add:title 
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter set equal to add:title
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client adds title to an entry with the targeted branch dn.
@@ -280,7 +280,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter equals del:title 
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter set equal to del:title
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client adds telephonenumber to an entry with the targeted branch dn.
@@ -424,7 +424,7 @@
           The tag, TestMarker, must be the same as the tag, TestSuiteName.
           #@TestMarker                ACI Targattrfilter Tests
           #@TestName                  Targattrfilter equals add:l,del:l
-          #@TestIssue                 437
+          #@TestIssue                 none
           #@TestPurpose               Test with the targattrfilter set equal to add:l,del:l
           #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
           #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -555,7 +555,7 @@
           The tag, TestMarker, must be the same as the tag, TestSuiteName.
           #@TestMarker                ACI Targattrfilter Tests
           #@TestName                  Targattrfilter equals add:st,del:st - st not present
-          #@TestIssue                 437
+          #@TestIssue                 none
           #@TestPurpose               Test with the targattrfilter set equal to add:st,del:st - st not present
           #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
           #@TestStep                  Client replaces st in an entry with the targeted branch dn.
@@ -686,7 +686,7 @@
           The tag, TestMarker, must be the same as the tag, TestSuiteName.
           #@TestMarker                ACI Targattrfilter Tests
           #@TestName                  Targattrfilter equals add:l,del:l
-          #@TestIssue                 437
+          #@TestIssue                 none
           #@TestPurpose               Test with the targattrfilter set equal to add:l,del:l
           #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
           #@TestStep                  Client replaces l in an entry with the targeted branch dn.
@@ -815,7 +815,7 @@
           The tag, TestMarker, must be the same as the tag, TestSuiteName.
           #@TestMarker                ACI Targattrfilter Tests
           #@TestName                  Targattrfilter equals add:street,del:street, street not present  
-          #@TestIssue                 437
+          #@TestIssue                 none
           #@TestPurpose               Test with the targattrfilter set equal to add:street,del:street
           #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
           #@TestStep                  Client replaces st in an entry with the targeted branch dn.
@@ -946,7 +946,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter equals add:title,del:title - wildcards
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter set equal to add:title,del:title with wildcards
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client replaces st in an entry with the targeted branch dn.
@@ -1064,7 +1064,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter with misppelled add 
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter with mispelled add
       #@TestPreamble              none
       #@TestStep                  Admin adds the aci.
@@ -1124,7 +1124,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter with misppelled del 
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter with mispelled del
       #@TestPreamble              none
       #@TestStep                  Admin adds the aci.
@@ -1184,7 +1184,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter with misppelled del with add
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter with mispelled del
       #@TestPreamble              none
       #@TestStep                  Admin adds the aci.
@@ -1244,7 +1244,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter with missing comma 
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter with missing comma
       #@TestPreamble              none
       #@TestStep                  Admin adds the aci.
@@ -1304,7 +1304,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter with extra quotes 
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter with extra quotes
       #@TestPreamble              none
       #@TestStep                  Admin adds the aci.
@@ -1364,7 +1364,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter with extra commas 
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter with extra commas
       #@TestPreamble              none
       #@TestStep                  Admin adds the aci.
@@ -1424,7 +1424,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter with missing argument for add 
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter with missing argument for add 
       #@TestPreamble              none
       #@TestStep                  Admin adds the aci.
@@ -1484,7 +1484,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter with missing argument for del 
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter with missing argument for del 
       #@TestPreamble              none
       #@TestStep                  Admin adds the aci.
@@ -1544,7 +1544,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targattrfilter Tests
       #@TestName                  Targattrfilter with missing argument for del with add
-      #@TestIssue                 437
+      #@TestIssue                 none
       #@TestPurpose               Test with the targattrfilter with missing argument for del with add
       #@TestPreamble              none
       #@TestStep                  Admin adds the aci.
@@ -1604,7 +1604,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targattrfilter Tests
         #@TestName                  Targattrfilter equals del:l,add:l
-        #@TestIssue                 437
+        #@TestIssue                 none
         #@TestPurpose               Test with the targattrfilter set equal to del:l,add:l
         #@TestPreamble              none
         #@TestStep                  Admin adds the aci.
@@ -1664,7 +1664,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targattrfilter Tests
         #@TestName                  Targattrfilter with very long comment portion 
-        #@TestIssue                 437
+        #@TestIssue                 none
         #@TestPurpose               Test with the targattrfilter with very long comment portion 
         #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
         #@TestStep                  Client adds title to an entry with the targeted branch dn.
@@ -1768,7 +1768,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Targattrfilter Tests
     #@TestName                  Postamble
-    #@TestIssue                 437
+    #@TestIssue                 none
     #@TestPurpose               Test default aci settings
     #@TestPreamble              none
     #@TestStep                  Client searches entry with a branch dn.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/target/target_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/target/target_tests.xml
index e22d708..29ee98d 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/target/target_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/target/target_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -33,7 +33,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Target Tests
         #@TestName                  Preamble
-        #@TestIssue                 434
+        #@TestIssue                 none
         #@TestPurpose               Test default aci settings
         #@TestPreamble              none
         #@TestStep                  Client searches entry with a branch dn.
@@ -137,7 +137,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn 
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -283,7 +283,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Target Tests
         #@TestName                  Target equals dn - new branch
-        #@TestIssue                 434
+        #@TestIssue                 none
         #@TestPurpose               Test with the target set equal to a dn - new branch
         #@TestPreamble              Admin adds entries under two branches, one with an aci with the target equal to the dn of one branch.
         #@TestStep                  Client searches entry with the targeted branch dn.
@@ -440,7 +440,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Target Tests
     #@TestName                  Target equals dn with trailing wildcard
-    #@TestIssue                 434
+    #@TestIssue                 none
     #@TestPurpose               Test with the target set equal to a dn with a trailing wildcard
     #@TestPreamble              Admin adds an aci with the target equal to the dn with a trailing wildcard.
     #@TestStep                  Client searches entry with the targeted branch dn.
@@ -586,7 +586,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Target Tests
     #@TestName                  Target equals dn with leading wildcard
-    #@TestIssue                 434
+    #@TestIssue                 none
     #@TestPurpose               Test with the target set equal to a dn with leading wildcard
     #@TestPreamble              Admin adds an aci with the target equal to the dn with a leading wildcard.
     #@TestStep                  Client searches entry with the targeted branch dn.
@@ -732,7 +732,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Target Tests
     #@TestName                  Target equals dn with internal wildcard
-    #@TestIssue                 434
+    #@TestIssue                 none
     #@TestPurpose               Test with the target set equal to a dn with an internal wildcard
     #@TestPreamble              Admin adds an aci with the target equal to the dn with an internal wildcard.
     #@TestStep                  Client searches entry with the targeted branch dn.
@@ -878,7 +878,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn with multiple wildcards
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn with multiple wildcards
       #@TestPreamble              Admin adds an aci with the target equal to the dn with multiple wildcards.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -1024,7 +1024,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target contains keyword self
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test if target can contain the keyword self
       #@TestPreamble              none
       #@TestStep                  Admin adds an aci that contains the keyword
@@ -1111,7 +1111,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target set to a dn above the entry
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test if the target can contain a DN above the
                                   level of the entry
       #@TestPreamble              none
@@ -1199,7 +1199,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target set to a dn below the entry
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test if the target can contain a DN below the
                                   level of the entry
       #@TestPreamble              none
@@ -1345,7 +1345,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Multiple targets
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test if an aci is allowed to contain multiple targets
       #@TestPreamble              none
       #@TestStep                  Admin adds an aci to an existing entry
@@ -1434,7 +1434,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target with mispelled keyword target
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test if an aci is allowed that contains the keyword target misspelled
       #@TestPreamble              none
       #@TestStep                  Admin adds an aci to an existing entry
@@ -1523,7 +1523,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target with missing leading ldap:
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test if an aci is allowed that contains the keyword target misspelled
       #@TestPreamble              none
       #@TestStep                  Admin adds an aci to an existing entry
@@ -1612,7 +1612,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target with ldap:all
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test if an aci is allowed that contains the keyword target with all
       #@TestPreamble              none
       #@TestStep                  Admin adds an aci to an existing entry
@@ -1701,7 +1701,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target ACI with mispelled version
-      #@TestIssue                 1750
+      #@TestIssue                 none
       #@TestPurpose               Test if an aci is allowed that contains version mispelled
       #@TestPreamble              none
       #@TestStep                  Admin adds an aci to an existing entry
@@ -1789,7 +1789,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Enable and disable ACIs
-      #@TestIssue                 432
+      #@TestIssue                 none
       #@TestPurpose               Enable and disable access control functionality
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -2069,7 +2069,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Enable and disable global ACIs
-      #@TestIssue                 432
+      #@TestIssue                 none
       #@TestPurpose               Enable and disable access control functionality
       #@TestPreamble              none
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -2224,7 +2224,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Target Tests
         #@TestName                  Target equals dn with userdn equal all
-        #@TestIssue                 453
+        none
         #@TestPurpose               Test with the target set equal to a dn with userdn equal all
         #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
         #@TestStep                  Client searches entry with the targeted branch dn with authenticated user.
@@ -2368,7 +2368,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn with userdn equal anyone
-      #@TestIssue                 453
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn with userdn equal anyone
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn with authenticated user.
@@ -2512,7 +2512,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn with userdn not equal all
-      #@TestIssue                 453
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn with userdn not equal all
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn with authenticated user.
@@ -2656,7 +2656,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn with userdn equal self
-      #@TestIssue                 453
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn with userdn equal self
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn with authenticated user.
@@ -2802,7 +2802,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn with userdn equal self with wildcard
-      #@TestIssue                 453
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn with userdn equal self with wildcard
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn with authenticated user.
@@ -2948,7 +2948,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn with userdn equal self with wildcard and filter
-      #@TestIssue                 453
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn with userdn equal self with wildcard and filter
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn with authenticated user.
@@ -3094,7 +3094,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn with userdn equal self with wildcard and filter, deny
-      #@TestIssue                 453
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn with userdn equal self with wildcard and filter, deny
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn with authenticated user.
@@ -3231,7 +3231,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn with userdn equal self with wildcard and filter, allow and deny
-      #@TestIssue                 453
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn with userdn equal self with wildcard and filter, allow and deny
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn with authenticated user.
@@ -3377,7 +3377,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  userdn equals self - modify operational attributes
-      #@TestIssue                 1479
+      #@TestIssue                 none
       #@TestPurpose               Test userdn equals self - modify operational attributes
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client modifies attribute in an entry.
@@ -3504,7 +3504,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Search for operational attributes 
-      #@TestIssue                 1479
+      #@TestIssue                 none
       #@TestPurpose               Test search for operational attributes
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Admin modifies entry to generate a modifiersName and modifyTimestamp
@@ -3766,7 +3766,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn with comma
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn with comma
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -3924,7 +3924,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Target Tests
       #@TestName                  Target equals dn, default targetattr 
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test with the target set equal to a dn, default targetattr
       #@TestPreamble              Admin adds an aci with the target equal to the dn of one existing branch.
       #@TestStep                  Client searches entry with the targeted branch dn.
@@ -4071,7 +4071,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Target Tests
         #@TestName                  Postamble
-        #@TestIssue                 434
+        #@TestIssue                 none
         #@TestPurpose               Test default aci settings
         #@TestPreamble              none
         #@TestStep                  Client searches entry with a branch dn.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml b/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
index 158bc23..775cde9 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS.
 ! -->
 <stax>
   <defaultcall function="monitoring_provider"/>
@@ -292,7 +293,7 @@
   #@TestMarker            Monitoring Provider Tests
   #@TestName              System Info monitoring Provider
   #@TestPurpose           Test the System Info monitoring Provider
-  #@TestIssue             2873
+  #@TestIssue             OPENDJ-876
   #@TestPreamble          none
   #@TestStep              Check the entry on cn=System Info,cn=monitor is available
   #@TestStep              Disable the System Info monitoring Provider
@@ -316,7 +317,7 @@
                 'dsBaseDN'          : 'cn=System Info,cn=monitor',
                 'dsFilter'          : 'objectclass=*',
                 'expectedRC'        :  0 ,
-                'knownIssue'        : '2873' }
+                'knownIssue'        : 'OPENDJ-876' }
               </call>  	    
               
               <message>'-- Disable the System Info monitor provider --'</message>   
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml
index a80680f..26b6c3b 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
     
@@ -1483,9 +1483,6 @@
                     # => expect NO entry returned
                     # => len(searchResult) = 0 => resultLength = 0
                     myExpectedRC = 0
-                    # if entry not purged => we may have run into Issue 3736
-                    # (Dynamic purge delay change not taken into account)
-                    myKnownIssue = '3736'
                   else:
                     # purge delay not expired (default purge delay: 1 day)
                     # => expect entry returned
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict_tests.xml
index 23d36ce..19a8f0b 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Portions Copyright 2006-2009 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -2931,11 +2931,8 @@
 
             <!-- Verify the synchronization of the trees among the servers in 
               the topology -->
-            <!-- If the trees don't match, we may have come across Issue 3891
-             (Replication conflict: add child , delete parent) -->
             <call function="'verifyTrees'">
-              [ clientHost, clientPath, server1, [server2], synchroSuffix,
-                '3891' ]
+              [ clientHost, clientPath, server1, [server2], synchroSuffix ]
             </call> 
 
             <!-- Delete added entries -->
@@ -3213,11 +3210,8 @@
 
             <!-- Verify the synchronization of the trees among the servers in 
               the topology -->
-            <!-- If the trees don't match, we may have come across Issue 4071
-             (Replication conflict: delete parent, add child) -->
             <call function="'verifyTrees'">
-              [ clientHost, clientPath, server1, [server2], synchroSuffix,
-                '4071' ]
+              [ clientHost, clientPath, server1, [server2], synchroSuffix ]
             </call> 
 
             <!-- Delete added entries -->
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
index a1f0380..fd47765 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
@@ -3542,12 +3542,7 @@
                    indexvar="indx">
             <sequence>
               <script>
-                if ecl_mode == 'opends':
-                  # Issue 4502: ECL: error 53 when searching with cookie older
-                  # than updates on several server
-                  myKnownIssue = '4502'
-                else:
-                  myKnownIssue = None
+                myKnownIssue = None
                 
                 replServer = server
                 replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
@@ -3832,12 +3827,7 @@
                    indexvar="indx">
             <sequence>
               <script>
-                if ecl_mode == 'opends':
-                  # Issue 4502: ECL: error 53 when searching with cookie older
-                  # than updates on several server
-                  myKnownIssue = '4502'
-                else:
-                  myKnownIssue = None
+                myKnownIssue = None
                 
                 replServer = server
                 replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
@@ -4117,12 +4107,7 @@
                    indexvar="indx">
             <sequence>
               <script>
-                if ecl_mode == 'opends':
-                  # Issue 4502: ECL: error 53 when searching with cookie older
-                  # than updates on several server
-                  myKnownIssue = '4502'
-                else:
-                  myKnownIssue = None
+                myKnownIssue = None
                 
                 replServer = server
                 replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
@@ -4355,12 +4340,7 @@
                    indexvar="indx">
             <sequence>
               <script>
-                if ecl_mode == 'opends':
-                  # Issue 4502: ECL: error 53 when searching with cookie older
-                  # than updates on several server
-                  myKnownIssue = '4502'
-                else:
-                  myKnownIssue = None
+                myKnownIssue = None
                 
                 replServer = server
                 replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
@@ -4831,7 +4811,7 @@
                      !   Result Code:  53 (Unwilling to Perform)
                      !   Additional Information:  Full resync required. Reason: 
                      !   The provided cookie is missing the replicated domain(s)
-                     !   my_domain:;. Possible cookie: <new_cookie>
+                     !   my_domain:;. Current starting cookie: <new_cookie>
                     -->
                     <sequence>
                       <message>
@@ -5889,7 +5869,7 @@
                    !   Result Code:  53 (Unwilling to Perform)
                    !   Additional Information:  Full resync required. Reason: 
                    !   The provided cookie contains unknown replicated domain 
-                   !   {old_cookie}. Possible cookie: <new_cookie>
+                   !   {old_cookie}. Current starting cookie: <new_cookie>
                   -->
                   <sequence>
                     <message>
@@ -5909,7 +5889,7 @@
                       
                       if searchStringRC == 0:
                         # Retrieve the suggested cookie value
-                        totem      = 'Possible cookie:'
+                        totem      = 'Current starting cookie'
                         lenTotem   = len(totem) + 2
                         indexTotem = searchResult.index(totem)
                         newCookie  = searchResult[indexTotem + lenTotem:]
@@ -6410,7 +6390,7 @@
                  !   Result Code:  53 (Unwilling to Perform)
                  !   Additional Information:  Full resync required. Reason: 
                  !   The provided cookie is missing the replicated domain(s)
-                 !   my_domain:;. Possible cookie: <new_cookie>
+                 !   my_domain:;. Current starting cookie: <new_cookie>
                 -->
                 <sequence>
                   <message>
@@ -6904,12 +6884,7 @@
                    indexvar="indx">
             <sequence>
               <script>
-                if ecl_mode == 'opends':
-                  # Issue 4502: ECL: error 53 when searching with cookie older
-                  # than updates on several server
-                  myKnownIssue = '4502'
-                else:
-                  myKnownIssue = None
+                myKnownIssue = None
                 
                 replServer = server
                 replServerPath = '%s/%s' % (replServer.getDir(), OPENDSNAME)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml
index eab2110..afcb6d2 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -871,9 +871,7 @@
             </paralleliterate>
                               
             <!-- Verify the synchronization of the trees among the servers in
-              the topology -->
-            <!-- If the trees don't match, we may have come across Issue 4052
-             (Ghost adds in Replication Server) -->              
+              the topology -->           
             <call function="'verifyTrees'">
               [ clientHost, clientPath, master, resyncConsumerList, synchroSuffix ]
             </call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_customconf_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_customconf_tests.xml
index a01c4f6..7ead9eb 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_customconf_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_customconf_tests.xml
@@ -24,14 +24,14 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2012 ForgeRock AS
+ !      Portions Copyright 2012-2013 ForgeRock AS
  ! -->
 <stax>
 
   <!--- Test Case information
     #@TestMarker          SNMP traps with custom configuration
     #@TestName            traps_customconf: TODO
-    #@TestIssue           3435
+    #@TestIssue           OPENDJ-870
     #@TestPurpose         TODO.
     #@TestPreamble        none
     #@TestStep            TODO.
@@ -91,7 +91,7 @@
                       'snmpTrapCommunity' : defTrapsCommunityProp ,
                       'snmpTrapNumber'    : '0,2,0,0,0,0' ,
                       'outputFile'        : outputFile2 ,
-                      'knownIssue'        : '3435'
+                      'knownIssue'        : 'OPENDJ-870'
                       }
                     </call>
                   </sequence>
@@ -180,7 +180,7 @@
                       'snmpTrapCommunity' : newTrapsCommunityProp ,
                       'snmpTrapNumber'    : '2,0,0,0,0,0' ,
                       'outputFile'        : outputFile2 ,
-                      'knownIssue'       : '3435'
+                      'knownIssue'        : 'OPENDJ-870'
                       }
                     </call>
                   </sequence>
@@ -300,7 +300,7 @@
   <!--- Test Case information
     #@TestMarker          SNMP traps with custom configuration
     #@TestName            traps_customconf: TODO
-    #@TestIssue           3435
+    #@TestIssue           OPENDJ-870
     #@TestPurpose         TODO.
     #@TestPreamble        none
     #@TestStep            TODO.
@@ -360,7 +360,7 @@
                       'snmpTrapCommunity' : defTrapsCommunityProp ,
                       'snmpTrapNumber'    : '2,0,0,0,0,0' ,
                       'outputFile'        : outputFile2 ,
-                      'knownIssue'        : '3435'
+                      'knownIssue'        : 'OPENDJ-870'
                       }
                     </call>
                   </sequence>
@@ -691,7 +691,7 @@
   <!--- Test Case information
     #@TestMarker          SNMP traps with custom configuration
     #@TestName            traps_customconf: TODO
-    #@TestIssue           3435
+    #@TestIssue           OPENDJ-870
     #@TestPurpose         TODO.
     #@TestPreamble        none
     #@TestStep            TODO.
@@ -763,7 +763,7 @@
                       'snmpTrapCommunity' : defTrapsCommunityProp ,
                       'snmpTrapNumber'    : '2,0,0,0,0,0' ,
                       'outputFile'        : outputFile2 ,
-                      'knownIssue'        : '3435'
+                      'knownIssue'        : 'OPENDJ-870'
                       }
                     </call>
                   </sequence>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_defaultconf_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_defaultconf_tests.xml
index 5da877a..27ed61c 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_defaultconf_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_defaultconf_tests.xml
@@ -24,14 +24,14 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2012 ForgeRock AS
+ !      Portions Copyright 2012-2013 ForgeRock AS
  ! -->
 <stax>
 
   <!--- Test Case information
     #@TestMarker          SNMP traps with default configuration
     #@TestName            traps_defaultconf: traps on stop-ds
-    #@TestIssue           3435
+    #@TestIssue           OPENDJ-870
     #@TestPurpose         Check that a trap is sent on default trap
                           community after stop-ds command.
     #@TestPreamble        none
@@ -70,7 +70,7 @@
                       'snmpTrapCommunity' : trapsCommunity ,
                       'snmpTrapNumber'    : '1,0,0,0,0,0' ,
                       'outputFile'        : outputFile ,
-                      'knownIssue'        : '3435'
+                      'knownIssue'        : 'OPENDJ-870'
                       }
                     </call>
                   </sequence>
@@ -274,7 +274,7 @@
   <!--- Test Case information
     #@TestMarker          SNMP traps with default configuration
     #@TestName            traps_defaultconf: trap on stop-ds -R
-    #@TestIssue           3435
+    #@TestIssue           OPENDJ-870
     #@TestPurpose         Check that 2 traps are sent on default trap
                           community after stop-ds -R command.
     #@TestPreamble        none
@@ -311,7 +311,7 @@
                       'snmpTrapCommunity' : trapsCommunity ,
                       'snmpTrapNumber'    : '2,0,0,0,0,0' ,
                       'outputFile'        : outputFile ,
-                      'knownIssue'        : '3435'
+                      'knownIssue'        : 'OPENDJ-870'
                       }
                     </call>
                   </sequence>
diff --git a/opends/tests/staf-tests/shared/ant/build.xml b/opends/tests/staf-tests/shared/ant/build.xml
index e0f9f6b..8ac150e 100644
--- a/opends/tests/staf-tests/shared/ant/build.xml
+++ b/opends/tests/staf-tests/shared/ant/build.xml
@@ -23,7 +23,7 @@
  !
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS
+ !      Portions Copyright 2011-2013 ForgeRock AS
  ! -->
 <project name="opends-staf-tests" basedir="../.." default="usage">
 
@@ -61,9 +61,6 @@
     <!-- Define antfile.dir variable -->
     <property name="antfile.dir" value="${basedir}/shared/ant"/>
 
-    <!-- Define tmp.dir variable -->
-    <property name="tmp.dir" value="${java.io.tmpdir}/temp_files"/>
-
     <!-- Load ant-contrib -->
     <taskdef resource="net/sf/antcontrib/antlib.xml">
       <classpath>
@@ -161,7 +158,10 @@
         </if>
       </default>
     </switch>
-
+  	
+    <!-- Define tmp.dir variable -->
+    <property name="tmp.dir" value="${java.io.tmpdir}/temp_files/${host.name}"/>
+  	
     <!-- Default value for staf.type -->
     <if>
       <not>

--
Gitblit v1.10.0