From cfe491a95cf51a0629393ec1825df9d7ebde23d2 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 11 Apr 2013 14:51:29 +0000
Subject: [PATCH] CR-1510 Remove reference to old known issues (part1)

---
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml  |   11 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml                             |   13 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml                        |    7 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml                       |    8 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml                            |    7 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml                          |    9 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml                                |   21 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml                                 |   11 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml                                  |   31 -
 opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml                                                    |    3 
 opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic_tests.xml                              |    8 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml     |   11 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml                                    |   13 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml                         |    7 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml                                |    8 
 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml                            |    3 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml                                |    7 
 opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml                        |    3 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml                        |    7 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml                           |    9 
 opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml                         |    5 
 opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml                                                  |   26 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml                                 |    7 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml                             |   15 
 opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml                            |   32 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml                                      |   36 +-
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml  |   11 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml                           |    7 
 opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter_tests.xml                              |   44 +-
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml                               |    3 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml                           |    3 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml     |    7 
 opends/tests/staf-tests/functional-tests/testcases/aci/import/import_tests.xml                                          |    4 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml                                  |   17 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml                          |   27 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml                        |    9 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml                   |   19 
 opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml                                     |   11 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml                                |    7 
 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml                         |    3 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml                            |    7 
 opends/tests/staf-tests/shared/functions/topology.xml                                                                   |   35 -
 opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml                                 |    4 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml                                 |    4 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml  |   11 
 opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol_tests.xml                            |   12 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BLOWFISH.xml                       |    7 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml                            |    7 
 opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry_tests.xml                                    |   34 +-
 opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth_tests.xml                                  |   24 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml                            |    7 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml                          |    7 
 opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml                          |    5 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml                               |    5 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml                                  |    3 
 opends/tests/staf-tests/functional-tests/testcases/setup/import.xml                                                     |    5 
 opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml                              |   13 
 opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr_tests.xml                                  |   28 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml                           |    7 
 opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml                                   |    9 
 opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml                                                  |    5 
 opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml                                  |    5 
 opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml                        |    7 
 /dev/null                                                                                                               |   29 -
 opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml                       |    5 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml                              |   29 
 opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml                        |    3 
 opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml                               |    8 
 opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml                           |   90 ++---
 opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml                                   |    5 
 opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml |   42 --
 opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks_tests.xml                              |    6 
 opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapsearch.xml                          |   26 
 opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml    |   11 
 opends/tests/staf-tests/shared/java/parsingtool/README                                                                  |    5 
 75 files changed, 439 insertions(+), 561 deletions(-)

diff --git a/opends/tests/staf-tests/functional-tests/shared/data/replication/workaround-2201.ldif b/opends/tests/staf-tests/functional-tests/shared/data/replication/workaround-2201.ldif
deleted file mode 100644
index 562b9bd..0000000
--- a/opends/tests/staf-tests/functional-tests/shared/data/replication/workaround-2201.ldif
+++ /dev/null
@@ -1,29 +0,0 @@
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE
-# or https://OpenDS.dev.java.net/OpenDS.LICENSE.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at
-# trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
-#      Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#      Copyright 2007-2008 Sun Microsystems, Inc.
-#
-
-dn: ds-cfg-key-id=ads-certificate,cn=ads-truststore
-objectclass: top
-objectclass: ds-cfg-self-signed-cert-request
-
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry_tests.xml
index 19ab2c2..a42a4d3 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_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 Add Entry Tests
         #@TestName                  Preamble
-        #@TestIssue                 439
+        #@TestIssue                 none
         #@TestPurpose               Test default aci settings
         #@TestPreamble              none
         #@TestStep                  Add extra branches where new entries will be added
@@ -89,7 +89,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry - userdn equals all
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against an ACi where userdn equals all
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -219,7 +219,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - userdn equals a dn
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against an ACI where userdn equals a dn 
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -364,7 +364,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - userdn not equals a dn
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against an ACI where the userdn not equals a dn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -509,7 +509,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - add not allowed
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry where the ACI does not allow an add
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -612,7 +612,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - targetfilter with one statement
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against an ACI with one targetfilter.
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -742,7 +742,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - targetfilter with non-existent attribute
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against an ACI with a targetfilter with non-existent attribute
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -861,7 +861,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - targetattr with one attribute
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against an ACI with a targetattr with one attribute.
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -992,7 +992,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - targattrfilter with add:,del:
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against an ACI with a targattrfilter with add:,del:.
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -1122,7 +1122,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - targattrfilter with add: only
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against an ACI with a targattrfilter with add: only.
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -1252,7 +1252,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - targattrfilter with add: statement false
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against an ACI with a targattrfilter with add: statement false.
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -1370,7 +1370,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - Multi ACIs 1, overall deny
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against two ACIs with with overall deny
       #@TestPreamble              Admin adds two acis.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -1487,7 +1487,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - Multi ACIs 2, overall allow
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against two ACIs with an overall allow
       #@TestPreamble              Admin adds two acis.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -1603,7 +1603,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - Multi ACIs 3, mixed allow and deny 
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against multiple ACIs where the allow or deny depends on specific userds
       #@TestPreamble              Admin adds two acis.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -1734,7 +1734,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - Multi ACIs 4, overall allow with many ACIs
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against many ACIs with an overall allow
       #@TestPreamble              Admin adds many acis.
       #@TestStep                  Client adds an entry in the targeted branch.
@@ -1850,7 +1850,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Add Entry Tests
       #@TestName                  Add Entry  - Multi ACIs 5, mixed allow and deny with many ACIs
-      #@TestIssue                 439
+      #@TestIssue                 none
       #@TestPurpose               Add an entry against many ACIs where the allow or deny depends on specific userds
       #@TestPreamble              Admin adds many acis.
       #@TestStep                  Client adds an entry in the targeted branch.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml
index 447f829..681bc37 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_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 Compare Tests
       #@TestName                  Preamble
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Modify global ACIs
       #@TestPreamble              none
       #@TestStep                  Directory Manager removes global ACI allowing compares
@@ -87,7 +87,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - userdn equals all
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI where userdn equals all
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -217,7 +217,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - userdn not equals a dn
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI where userdn not equals a dn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -363,7 +363,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - userdn equals a branch dn
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI where userdn equals a branch dn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -499,7 +499,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - userdn not equals a branch dn
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI where userdn equals a branch dn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -653,7 +653,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - userdn equals two dns
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI where userdn equals two dns
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -807,7 +807,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - userdn not equals two dns
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI where userdn equals a branch dn
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -943,7 +943,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - compare not allowed
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI where compare is not allowed
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -1062,7 +1062,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - targetattr with one attribute
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI with a targetattr with one attribute
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -1208,7 +1208,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - targetfilter with one statement
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI with a targetfilter with one statement
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -1354,7 +1354,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - targattrfilters with add:,del:
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI with a targattrfilters with add:,del
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -1508,7 +1508,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - targattrfilters with add:,del:, returns false
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against an ACI with a targattrfilters with add:,del
       #@TestPreamble              Admin adds an aci to the dn of one existing branch.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -1662,7 +1662,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - Multi ACIs 1, overall deny
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against two ACIs, overall deny 
       #@TestPreamble              Admin adds acis.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -1766,7 +1766,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Compare Tests
       #@TestName                  Compare Attr - Multi ACIs 2, overall allow
-      #@TestIssue                 441
+      #@TestIssue                 none
       #@TestPurpose               Compare an attribute in an entry against two ACIs, overall allow 
       #@TestPreamble              Admin adds acis.
       #@TestStep                  Client compares an attribute in an entry in the targeted branch.
@@ -1880,7 +1880,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Compare Tests
     #@TestName                  Postamble
-    #@TestIssue                 441
+    #@TestIssue                 none
     #@TestPurpose               Reset global ACI to default settings
     #@TestPreamble              none
     #@TestStep                  Directory Manager replaces default global aci.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/import/import_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/import/import_tests.xml
index e758fa9..1da6fb1 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/import/import_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/import/import_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 Import Tests
       #@TestName                  ldif-import with bad ACI
-      #@TestIssue                 1758
+      #@TestIssue                 none
       #@TestPurpose               ldif-import with bad ACI
       #@TestPreamble              none
       #@TestStep                  Root user searching entry.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth_tests.xml
index 1722c86..ebc7e43 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth_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 Proxy Authorization Tests
       #@TestName                  Preamble
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test default aci settings
       #@TestPreamble              none
       #@TestStep                  Client searches entry for an attribute in a branch dn.
@@ -160,7 +160,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Proxy Authorization Tests
       #@TestName                  Proxy rights with one proxied user
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test ACI with proxy rights with one user, one proxied user
       #@TestPreamble              none
       #@TestStep                  Client searches entry in targeted branch as user.
@@ -368,7 +368,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Proxy Authorization Tests
       #@TestName                  Proxy rights with one user, one proxied user
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test ACI with proxy rights with one user, one proxied user
       #@TestPreamble              Admin adds an aci giving user search and read access to one branch.
       #@TestStep                  Client searches entry in targeted branch as user.
@@ -633,7 +633,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Proxy Authorization Tests
       #@TestName                  Proxy rights with one user for adds, one proxied user
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test ACI with proxy rights with one user for adds, one proxied user
       #@TestPreamble              Admin adds an aci giving user search and read access to one branch.
       #@TestStep                  Client searches entry in targeted branch as user.
@@ -874,7 +874,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Proxy Authorization Tests
       #@TestName                  Proxy rights with one user for searches, one proxied user
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test ACI with proxy rights with one user for searches, one proxied user
       #@TestPreamble              Admin adds an aci giving user search and read access to one branch.
       #@TestStep                  Client searches entry in targeted branch as user.
@@ -1128,7 +1128,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Proxy Authorization Tests
       #@TestName                  Proxy rights with one user for searches reads separate level, one proxied user
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test ACI with proxy rights with one user for searches reads separate level, one proxied user
       #@TestPreamble              Admin adds an aci giving user search and read access to one branch.
       #@TestStep                  Client searches entry in targeted branch as user.
@@ -1395,7 +1395,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Proxy Authorization Tests
       #@TestName                  Proxy rights with many users with wildcard, one proxied user
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test ACI with proxy rights with many users with wildcard, one proxied user
       #@TestPreamble              Admin adds an aci giving user search and read access to one branch.
       #@TestStep                  Client searches entry in targeted branch as user.
@@ -1662,7 +1662,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Proxy Authorization Tests
       #@TestName                  Proxy rights with one user, many proxied users with wildcard
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test ACI with proxy rights with one user, many proxied users with wildcard
       #@TestPreamble              Admin adds an aci giving user search and read access to one branch.
       #@TestStep                  Client searches entry in targeted branch as user.
@@ -1917,7 +1917,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Proxy Authorization Tests
       #@TestName                  Proxy rights with one user, one bad proxied user
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test ACI with proxy rights with one user, one bad proxied user
       #@TestPreamble              Admin adds an aci giving user search and read access to one branch.
       #@TestStep                  Client searches entry in targeted branch as user.
@@ -2194,7 +2194,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Proxy Authorization Tests
       #@TestName                  Proxy rights with Directory Manager as proxy
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test ACI with proxy rights with Directory Manager as proxy
       #@TestPreamble              Admin adds an aci giving user search and read access to one branch.
       #@TestStep                  Client searches entry in targeted branch as user.
@@ -2480,7 +2480,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Proxy Authorization Tests
       #@TestName                  Postamble
-      #@TestIssue                 1489
+      #@TestIssue                 none
       #@TestPurpose               Test default aci settings
       #@TestPreamble              none
       #@TestStep                  Client searches entry for an attribute in a branch dn.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr_tests.xml
index 04e4a79..2224b8e 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr_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 Targetattr Tests
       #@TestName                  Preamble
-      #@TestIssue                 435
+      #@TestIssue                 none
       #@TestPurpose               Test default aci settings
       #@TestPreamble              none
       #@TestStep                  Client searches entry for an attribute in a branch dn.
@@ -136,7 +136,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetattr Tests
       #@TestName                  Targetattr equals one attribute
-      #@TestIssue                 435
+      #@TestIssue                 none
       #@TestPurpose               Test with the targetattr set equal to a specific attribute
       #@TestPreamble              Admin adds an aci to one branch with the targetattr equal to a specific attribute.
       #@TestStep                  Client searches entry with the targeted dn for the targetattr.
@@ -295,7 +295,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetattr Tests
       #@TestName                  Targetattr not equals one attribute
-      #@TestIssue                 435
+      #@TestIssue                 none
       #@TestPurpose               Test with the targetattr set to not equal (!=) a specific attribute
       #@TestPreamble              Admin adds an aci to one branch with the targetattr not equal to a specific attribute.
       #@TestStep                  Client searches entry with the targeted dn for the targetattr.
@@ -454,7 +454,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetattr Tests
       #@TestName                  Targetattr equals three attributes
-      #@TestIssue                 435
+      #@TestIssue                 none
       #@TestPurpose               Test with the targetattr set equal to three specific attributes
       #@TestPreamble              Admin adds an aci with the targetattr equal to three specific attributes in one branch.
       #@TestStep                  Client searches entry with the targeted dn for the targetattrs.
@@ -625,7 +625,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetattr Tests
       #@TestName                  Targetattr not equals three attributes
-      #@TestIssue                 435
+      #@TestIssue                 none
       #@TestPurpose               Test with the targetattr set to not equal (!=) to three specific attributes
       #@TestPreamble              Admin adds an aci with the targetattr not equal (!=) to three specific attributes in one branch.
       #@TestStep                  Client searches entry with the targeted dn for the targetattr.
@@ -796,7 +796,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                ACI Targetattr Tests
     #@TestName                  Attribute mispelled or non-existent in the entry - Use Not Equals
-    #@TestIssue                 435
+    #@TestIssue                 none
     #@TestPurpose               Test if an aci is allowed where the targetattr has an attribute not in the entry
     #@TestPreamble              none
     #@TestStep                  Admin adds an aci to an existing entry
@@ -946,7 +946,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetattr Tests
       #@TestName                  Multiple targetattrs
-      #@TestIssue                 435
+      #@TestIssue                 none
       #@TestPurpose               Test if an aci is allowed to contain multiple targetattrs
       #@TestPreamble              none
       #@TestStep                  Admin adds an aci to an existing entry
@@ -1031,7 +1031,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetattr Tests
       #@TestName                  targetattr mispelled
-      #@TestIssue                 435
+      #@TestIssue                 none
       #@TestPurpose               Test if an aci is allowed that has the keyword targetattr mispelled
       #@TestPreamble              none
       #@TestStep                  Admin adds an aci to an existing entry
@@ -1116,7 +1116,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetattr Tests
       #@TestName                  targetattr with missing quotes
-      #@TestIssue                 435
+      #@TestIssue                 none
       #@TestPurpose               Test if an aci is allowed that has the keyword targetattr with missing quotes
       #@TestPreamble              none
       #@TestStep                  Admin adds an aci to an existing entry
@@ -1201,7 +1201,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetattr Tests
         #@TestName                  Targetattr With Spaces
-        #@TestIssue                 435
+        #@TestIssue                 none
         #@TestPurpose               Test with the targetattr that has spaces
         #@TestPreamble              Admin adds an aci to one branch with a targetattr with spaces.
         #@TestStep                  Client searches entry with the targeted dn for the targetattr.
@@ -1360,7 +1360,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetattr Tests
       #@TestName                  Targetattr not equals wildcard 
-      #@TestIssue                 434
+      #@TestIssue                 none
       #@TestPurpose               Test with the targetattr not equal to 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.
@@ -1508,7 +1508,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetattr Tests
       #@TestName                  Targetattr equals one attribute with wildcard
-      #@TestIssue                 435
+      #@TestIssue                 none
       #@TestPurpose               Test with the targetattr set equal to a specific attribute with wildcard
       #@TestPreamble              Admin adds an aci to one branch with the targetattr equal to a specific attribute.
       #@TestStep                  Client searches entry with the targeted dn for the targetattr.
@@ -1571,7 +1571,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetattr Tests
       #@TestName                  Postamble
-      #@TestIssue                 435
+      #@TestIssue                 none
       #@TestPurpose               Test default aci settings
       #@TestPreamble              none
       #@TestStep                  Client searches entry for an attribute in a branch dn.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol_tests.xml
index 8801552..274d64d 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol_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 Targetcontrol Tests
       #@TestName                  Preamble
-      #@TestIssue                 452
+      #@TestIssue                 none
       #@TestPurpose               Prepare for targetcontrol tests
       #@TestPreamble              none
       #@TestStep                  Admin removes global search ACI
@@ -121,7 +121,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetcontrol Tests
       #@TestName                  Targetcontrol using search effective rights with control allow
-      #@TestIssue                 452
+      #@TestIssue                 none
       #@TestPurpose               Test targetcontrol with search effective rights with control allow
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -283,7 +283,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetcontrol Tests
       #@TestName                  Targetcontrol using search effective rights with control deny 
-      #@TestIssue                 452
+      #@TestIssue                 none
       #@TestPurpose               Test targetcontrol with search effective rights with control deny
       #@TestPreamble              Admin adds an ACI to deny effective rights control and Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -512,7 +512,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetcontrol Tests
       #@TestName                  Targetcontrol using search effective rights with control allow 2
-      #@TestIssue                 452
+      #@TestIssue                 none
       #@TestPurpose               Test targetcontrol with search effective rights with control allow
       #@TestPreamble              Admin adds an aci.
       #@TestStep                  Client searches for effective rights in an entry in the targeted branch dn.
@@ -674,7 +674,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetcontrol Tests
       #@TestName                  Postamble
-      #@TestIssue                 452
+      #@TestIssue                 none
       #@TestPurpose               Reset targetcontrol tests
       #@TestPreamble              none
       #@TestStep                  Admin deletes ACI to access effective rights
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter_tests.xml
index d1ce6e9..9d9bac6 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter_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 Targetfilter Tests 
         #@TestName                  Preamble
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test default aci settings
         #@TestPreamble              none
         #@TestStep                  Client searches entry in a branch.
@@ -136,7 +136,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with one statement
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with one statement
         #@TestPreamble              Admin adds an aci with the targetfilter containing one statement.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -327,7 +327,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with one statement 2
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with one statement
         #@TestPreamble              Admin adds an aci with the targetfilter containing one statement.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -517,7 +517,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with one statement 3
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with one statement
         #@TestPreamble              Admin adds an aci with the targetfilter containing one statement.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -679,7 +679,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter set to negative of one statement
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with (not equals) one statement
         #@TestPreamble              Admin adds an aci with the targetfilter containing a negative of one statement.
         #@TestStep                  Client searches entry which should not be allowed with the targetfilter.
@@ -869,7 +869,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with three statements with or, one statement true
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with three statements with or and one statement is true
         #@TestPreamble              Admin adds an aci with the targetfilter containing three statements with or.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -1059,7 +1059,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter (not equals) with three statements with or, one statement true
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with not equals three statements with or and one statement is true
         #@TestPreamble              Admin adds an aci with the targetfilter containing three statements with or.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -1249,7 +1249,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with three statements with or, no statement true 
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with three statements with or and no statement is true
         #@TestPreamble              Admin adds an aci with the targetfilter containing three statements with or.
         #@TestStep                  Client searches entry which should not be allowed with the targetfilter.
@@ -1396,7 +1396,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with three statements with and, one statement true
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with three statements with and and one statement is true
         #@TestPreamble              Admin adds an aci with the targetfilter containing three statements with and.
         #@TestStep                  Client searches entry which should not be allowed with the targetfilter.
@@ -1542,7 +1542,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with three statements with and, all statements true 
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with three statements with and and all statements are true
         #@TestPreamble              Admin adds an aci with the targetfilter containing three statements with and.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -1732,7 +1732,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter (not equals) with three statements with and, all statements true 
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with not equals three statements with and and all statements are true
         #@TestPreamble              Admin adds an aci with the targetfilter containing three statements with and.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -1922,7 +1922,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with three statements with wildcard and or, one statement true
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with three statements with wildcard and or and one statement is true
         #@TestPreamble              Admin adds an aci with the targetfilter containing three statements with wildcard and or.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -2112,7 +2112,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with three statements with two wildcards and or, one statement true
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with three statements with two wildcards and or and one statement is true
         #@TestPreamble              Admin adds an aci with the targetfilter containing three statements with wildcard and or.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -2302,7 +2302,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with three statements with wildcard and and, all statements true
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with three statements with wildcard with and and all statements true
         #@TestPreamble              Admin adds an aci with the targetfilter containing three statements with wildcard with and.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -2492,7 +2492,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with three statements with three wildcards and and, all statements true
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with three statements with three wildcards with and and all statements true
         #@TestPreamble              Admin adds an aci with the targetfilter containing three statements with three wildcards with and.
         #@TestStep                  Client searches entry which should be allowed with the targetfilter.
@@ -2682,7 +2682,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with extra spaces 
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with extra spaces
         #@TestPreamble              Admin adds an aci with the targetfilter containing extra spaces.
         #@TestStep                  Client searches entry which should not be allowed with the targetfilter.
@@ -2803,7 +2803,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with missing quotes
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with missing quotes
         #@TestPreamble              none
         #@TestStep                  Admin adds an aci with the targetfilter with missing quotes.
@@ -2888,7 +2888,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with misplaced quotes
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with misplaced quotes
         #@TestPreamble              none
         #@TestStep                  Admin adds an aci with the targetfilter with misplaced quotes.
@@ -2973,7 +2973,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with Improperly Formatted Filter with or
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with improperly formatted filter with or
         #@TestPreamble              none
         #@TestStep                  Admin adds an aci with the targetfilter with misplaced quotes.
@@ -3058,7 +3058,7 @@
         The tag, TestMarker, must be the same as the tag, TestSuiteName.
         #@TestMarker                ACI Targetfilter Tests 
         #@TestName                  Targetfilter with Improperly Formatted Filter with and
-        #@TestIssue                 436
+        #@TestIssue                 none
         #@TestPurpose               Test with a targetfilter with improperly formatted filter with and
         #@TestPreamble              none
         #@TestStep                  Admin adds an aci with the targetfilter with misplaced quotes.
@@ -3143,7 +3143,7 @@
       The tag, TestMarker, must be the same as the tag, TestSuiteName.
       #@TestMarker                ACI Targetfilter Tests 
       #@TestName                  Postamble
-      #@TestIssue                 436
+      #@TestIssue                 none
       #@TestPurpose               Test default aci settings
       #@TestPreamble              none
       #@TestStep                  Client searches entry in one branch.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml
index 7e5e539..9bd5eea 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2009-2010 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -1499,8 +1500,7 @@
   </function>
   -->
 
-  <!-- Waiting for a fix to issue 3358 - Document possible values of
-       backend's je-property -->
+  <!-- Need a documentation for this property... -->
   <!--- Test Case information
     #@TestMarker          Backend Dbparams Tests
     #@TestName            Dbparams: je-property
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
index 90da282..2cb4b9f 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2009-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -1429,8 +1429,7 @@
             'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
             'dsCountEntries'   : 'True' ,
             'dsBaseDN'         : 'ou=people,dc=example,dc=com',
-            'dsFilter'         : 'objectClass=*',
-            'knownIssue'       : '6962694'
+            'dsFilter'         : 'objectClass=*'
           }
           </call>
 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
index de6270d..bdc73dc 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
   <!--- Test Case information
@@ -86,8 +86,7 @@
               'dsInstanceDn'        : DIRECTORY_INSTANCE_DN,
               'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
               'backupDir'           : '%s/backends/backup1' % remote.temp,
-              'extraParams'         : '--completionNotify foo@example.com',
-              'knownIssue'          : '6947587'
+              'extraParams'         : '--completionNotify foo@example.com'
             }
           </call>
           
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml
index 8533c00..510c782 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2009 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
   <!--- Test Case information
@@ -334,8 +334,7 @@
 
           <call function="'restore'">
             { 'backupDir'           : '%s/backends/backup3' % remote.temp ,
-              'extraParams'         : '-l' ,
-              'knownIssue'          : '4203'
+              'extraParams'         : '-l'
             }
           </call>
           <script>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
index aa9141f..31c4b73 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
   
@@ -112,7 +113,7 @@
             <!--- Test Case information
               #@TestMarker          ldapmodify check options tests
               #@TestName            ldapmodify: empty hostname
-              #@TestIssue           2619
+              #@TestIssue           none
               #@TestPurpose         Verify a parameter error doing an ldapmodify.
               #@TestPreamble        none
               #@TestStep            Do an ldapmodify with an empty hostname.
@@ -136,8 +137,7 @@
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                   'dsFilename'       : dsfilename ,
-                  'expectedRC'       : 89,
-                  'knownIssue'       : '2619'
+                  'expectedRC'       : 89
                   }
                 </call>
                 
@@ -188,7 +188,7 @@
             <!--- Test Case information
               #@TestMarker          ldapmodify check options tests
               #@TestName            ldapmodify: invalid port (bad_port)
-              #@TestIssue           2619
+              #@TestIssue           none
               #@TestPurpose         Verify a parameter error doing an ldapmodify.
               #@TestPreamble        none
               #@TestStep            Do an ldapmodify with an invalid port.
@@ -213,8 +213,7 @@
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                   'dsFilename'       : dsfilename ,
-                  'expectedRC'       : 89 ,
-                  'knownIssue'       : '2619'
+                  'expectedRC'       : 89
                   }
                 </call>
                 
@@ -227,7 +226,7 @@
             <!--- Test Case information
               #@TestMarker          ldapmodify check options tests
               #@TestName            ldapmodify: invalid port (-1)
-              #@TestIssue           2762
+              #@TestIssue           none
               #@TestPurpose         Verify a parameter error doing an ldapmodify.
               #@TestPreamble        none
               #@TestStep            Do an ldapmodify with an invalid port.
@@ -251,8 +250,7 @@
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                   'dsFilename'       : dsfilename ,
-                  'expectedRC'       : 89 ,
-                  'knownIssue'       : '2762'
+                  'expectedRC'       : 89
                   }
                 </call>
                 
@@ -340,7 +338,7 @@
             <!--- Test Case information
               #@TestMarker          ldapmodify check options tests
               #@TestName            ldapmodify: no password
-              #@TestIssue           2624
+              #@TestIssue           none
               #@TestPurpose         Verify an inappropriate authentication error 
                                     doing an ldapmodify.
               #@TestPreamble        none
@@ -367,8 +365,7 @@
                   'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsFilename'       : dsfilename ,
-                  'expectedRC'       : 48 ,
-                  'knownIssue'       : '2624'
+                  'expectedRC'       : 48
                   }
                 </call>
   
@@ -420,7 +417,7 @@
             <!--- Test Case information
               #@TestMarker          ldapmodify check options tests
               #@TestName            ldapmodify: empty filename
-              #@TestIssue           2619
+              #@TestIssue           none
               #@TestPurpose         Verify a parameter error doing an ldapmodify.
               #@TestPreamble        none
               #@TestStep            Do an ldapmodify with an empty filename.
@@ -444,8 +441,7 @@
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                   'dsFilename'       : ' ' ,
-                  'expectedRC'       : 89 ,
-                  'knownIssue'       : '2619'
+                  'expectedRC'       : 89
                   }
                 </call>
                 
@@ -458,7 +454,7 @@
             <!--- Test Case information
               #@TestMarker          ldapmodify check options tests
               #@TestName            ldapmodify: bad filename
-              #@TestIssue           2763
+              #@TestIssue           none
               #@TestPurpose         Verify a parameter error doing an ldapmodify.
               #@TestPreamble        none
               #@TestStep            Do an ldapmodify with a bad filename.
@@ -482,8 +478,7 @@
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                   'dsFilename'       : 'bad' ,
-                  'expectedRC'       : 89 ,
-                  'knownIssue'       : '2763'
+                  'expectedRC'       : 89
                   }
                 </call>
                 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
index b6c6dfc..3fb680c 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
   
@@ -77,7 +78,7 @@
             <!--- Test Case information
               #@TestMarker          ldapsearch check behavior tests
               #@TestName            ldapsearch: check number of entries
-              #@TestIssue           2764
+              #@TestIssue           none
               #@TestPurpose         Verify that the operation is successful and
                                     the number of returned entries is correct.
               #@TestPreamble        none
@@ -105,8 +106,7 @@
                   'dsTypesOnly'      : 'True' ,
                   'dsCountEntries'   : 'True' ,
                   'dsBaseDN'         : basedn ,
-                  'dsFilter'         : 'uid=user.1*' ,
-                  'knownIssue'       : '2764'
+                  'dsFilter'         : 'uid=user.1*'
                   }                
                 </call>
                 
@@ -130,7 +130,7 @@
             <!--- Test Case information
               #@TestMarker          ldapsearch check behavior tests
               #@TestName            ldapsearch: check behavior with default basedn
-              #@TestIssue           2934
+              #@TestIssue           none
               #@TestPurpose         Verify that the number of returned entries is
                                     correct with a base DN of "".
               #@TestPreamble        none
@@ -370,8 +370,7 @@
                 <call function="'checktestString'">
                   { 
                   'returnString'     : returnString ,
-                  'expectedString'   : 'Total number of matching entries: 11',
-                  'issue'            : '2934'
+                  'expectedString'   : 'Total number of matching entries: 11'
                   }
                 </call>
                 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml
index 96f93a9..2d1965d 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml
@@ -305,7 +305,7 @@
             <!--- Test Case information
               #@TestMarker          ldapsearch check options tests
               #@TestName            ldapsearch: no password provided
-              #@TestIssue           2624
+              #@TestIssue           none
               #@TestPurpose         Verify an inappropriate authentication error 
                                     doing an ldapsearch.
               #@TestPreamble        none
@@ -333,8 +333,7 @@
                   'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                   'dsBaseDN'         : basedn ,
                   'dsFilter'         : dsfilter ,
-                  'expectedRC'       : 48 ,
-                  'knownIssue'       : '2624'
+                  'expectedRC'       : 48
                   }
                 </call>
   
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapsearch.xml b/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapsearch.xml
index 3ce1b36..6791868 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapsearch.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapsearch.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2010 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
   <defaultcall function="clus_ssl_ldapsearch"/>
@@ -141,24 +142,19 @@
                 'dsBaseDN'         : 'dc=com' ,
                 'dsFilter'         : 'uid=user.340' ,
                 'dsAttributes'     : 'postalCode',
-                'expectedRC'       : 'noCheck',
-                'knownIssue'       : '6934118'
+                'expectedRC'       : 'noCheck'
                 }
               </call>
 
-              <if expr="RC == 0">
-                <sequence>
-                  <script>
-                    returnString = STAXResult[0][1]
-                  </script>
-                  <call function="'checktestString'">
-                    {
-                    'returnString'     : returnString ,
-                    'expectedString'   : 'Unrecognized SSL message'
-                    }
-                  </call>
-                </sequence>
-              </if>
+              <script>
+                returnString = STAXResult[0][1]
+              </script>
+              <call function="'checktestString'">
+                {
+                'returnString'     : returnString ,
+                'expectedString'   : 'Unrecognized SSL message'
+                }
+              </call>
 
               <call function="'testCase_Postamble'"/>
 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
index 5119e0b..c1aae3b 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Portions Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS
+ !      Portions Copyright 2011-2013 ForgeRock AS
 ! -->
 <stax>
   <defaultcall function="dsml_setup" />
@@ -375,8 +375,7 @@
                   <call function="'checktestString'">
                     {
                     'returnString'     : returnString ,
-                    'expectedString'   : 'Total number of matching entries: %s' % nbEntriesExpected,
-                    'issue'            : '4178'
+                    'expectedString'   : 'Total number of matching entries: %s' % nbEntriesExpected
                     }
                   </call>
 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml b/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml
index 1b75d9a..3247860 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2009-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
   <defaultcall function="fractional-replication_basic"/>
@@ -527,15 +527,6 @@
                                             ],
                   }
                 </call>
-
-                <if expr="RC != 0">
-                  <sequence>
-                    <call function="'setKnownIssue'">
-                      { 'issueId' : 0000 }
-                    </call>
-                    <break/>
-                  </sequence>
-                </if>
                </sequence>
             </else>
           </if>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml b/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
index e72eaa3..b7fece8 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2010 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
   <defaultcall function="main_indexes" />
@@ -165,8 +166,7 @@
                 <call function="'runFunction'">
                   { 'functionName'      : 'rebuildIndexWithScript' ,
                     'functionArguments' : { 'dsBaseDN'    : DIRECTORY_INSTANCE_SFX ,
-                                            'dsIndexList' : [ 'uid' ] ,
-                                            'knownIssue'  : '6931704'
+                                            'dsIndexList' : [ 'uid' ]
                                           }
                   }
                 </call>
@@ -218,8 +218,7 @@
                 <call function="'runFunction'">
                   { 'functionName'      : 'rebuildIndexWithScript' ,
                     'functionArguments' : { 'dsBaseDN'    : DIRECTORY_INSTANCE_SFX ,
-                                            'dsIndexList' : [ 'uid' ] ,
-                                            'knownIssue'  : '6931704'
+                                            'dsIndexList' : [ 'uid' ]
                                           }
                   }
                 </call>
@@ -266,7 +265,7 @@
       subString search and then verifies that it worked
       #@TestMarker                indexes
       #@TestName                  indexes_dynamic_modify
-      #@TestIssue                 1480
+      #@TestIssue                 none
       #@TestPurpose               harden the default indexes
       #@TestPreamble              none
       #@TestStep                  iterate through file search.filters
@@ -309,8 +308,7 @@
                         'dsInstanceDn'        : DIRECTORY_INSTANCE_DN,
                         'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
                         'dsBaseDN'            : DIRECTORY_INSTANCE_SFX,
-                        'dsIndexList'         : [ 'uid' ],
-                        'knownIssue'          : '6931704'
+                        'dsIndexList'         : [ 'uid' ]
                       }
                   }
                 </call>
@@ -349,8 +347,7 @@
                 <call function="'runFunction'">
                   { 'functionName'      : 'rebuildIndexWithScript' ,
                     'functionArguments' : { 'dsBaseDN'    : DIRECTORY_INSTANCE_SFX ,
-                                            'dsIndexList' : [ 'uid' ] ,
-                                            'knownIssue'  : '6931704'
+                                            'dsIndexList' : [ 'uid' ]
                                           }
                   }
                 </call>
@@ -446,8 +443,7 @@
                 <call function="'runFunction'">
                   { 'functionName'      : 'rebuildIndexWithScript' ,
                     'functionArguments' : { 'dsBaseDN'    : DIRECTORY_INSTANCE_SFX ,
-                                            'dsIndexList' : [ 'l' ] ,
-                                            'knownIssue'  : '6931704'
+                                            'dsIndexList' : [ 'l' ]
                                           }
                   }
                 </call>
@@ -512,7 +508,7 @@
       attribute and then verifies that it worked
       #@TestMarker              indexes
       #@TestName                indexes_dynamic_add
-      #@TestIssue               1480
+      #@TestIssue               none
       #@TestPurpose             check if the user can add her own indexes
                                 dynamically
       #@TestPreamble            none
@@ -558,8 +554,7 @@
                         'dsInstanceDn'        : DIRECTORY_INSTANCE_DN,
                         'dsInstancePswd'      : DIRECTORY_INSTANCE_PSWD,
                         'dsBaseDN'            : DIRECTORY_INSTANCE_SFX,
-                        'dsIndexList'         : [ 'l' ],
-                        'knownIssue'          : '6931704'
+                        'dsIndexList'         : [ 'l' ]
                       }
                   }
                 </call>
@@ -656,8 +651,7 @@
                 <call function="'runFunction'">
                   { 'functionName'      : 'rebuildIndexWithScript' ,
                     'functionArguments' : { 'dsBaseDN'    : DIRECTORY_INSTANCE_SFX ,
-                                            'dsIndexList' : [ 'l' ] ,
-                                            'knownIssue'  : '6931704'
+                                            'dsIndexList' : [ 'l' ]
                                           }
                   }
                 </call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml
index 597454d..afe8080 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -74,7 +75,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Backup Tasks Tests
                   #@TestName                  backend-backup
-                  #@TestIssue                 475
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for regular users to add backup tasks
                   #@TestPreamble              none
                   #@TestStep                  User adding backup task.
@@ -229,7 +230,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Backup Tasks Tests
                   #@TestName                  backend-backup, Directory Manager
-                  #@TestIssue                 475
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for Directory Manager to add backup tasks
                   #@TestPreamble              none
                   #@TestStep                  Directory Manager adding backup task.
@@ -331,7 +332,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Backup Tasks Tests
                   #@TestName                  backend-backup, New Root User
-                  #@TestIssue                 475
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for new root user to add backup tasks
                   #@TestPreamble              Admin adds new root user.
                   #@TestStep                  New root user adding backup task.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
index 553f30e..68a102e 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -75,7 +76,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  bypass-acl 
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               bypass-acl privilege for Directory Manager
                   #@TestPreamble              Alternate root user removes global search ACI.
                   #@TestStep                  Directory Manager searches entry.
@@ -271,7 +272,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  bypass-acl, alternate bind DN
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               bypass-acl privilege for Directory Manager using alternate bind dn
                   #@TestPreamble              Alternate root user removes global search ACI.
                   #@TestStep                  Directory Manager searches entry.
@@ -396,7 +397,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  modify-acl - add aci
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               modify-acl privilege for Directory Manager - add aci
                   #@TestPreamble              none
                   #@TestStep                  Directory Manager adds ACI, default behavior.
@@ -545,7 +546,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  modify-acl - replace aci
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               modify-acl privilege for Directory Manager - replace aci
                   #@TestPreamble              none
                   #@TestStep                  Directory Manager replaces ACI, default behavior.
@@ -656,7 +657,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  modify-acl - delete aci
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               modify-acl privilege for Directory Manager - delete aci
                   #@TestPreamble              none
                   #@TestStep                  Directory Manager deletes ACI, default behavior.
@@ -754,7 +755,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  config-read 
-                  #@TestIssue                 472
+                  #@TestIssue                 none
                   #@TestPurpose               config-read privilege for Directory Manager
                   #@TestPreamble              none
                   #@TestStep                  Directory Manager searches cn=config, default behavior.
@@ -886,7 +887,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  config-write 
-                  #@TestIssue                 472
+                  #@TestIssue                 none
                   #@TestPurpose               config-write privilege for Directory Manager
                   #@TestPreamble              none
                   #@TestStep                  Directory Manager modifies cn=config, default behavior.
@@ -1063,7 +1064,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  config-write - add global aci
-                  #@TestIssue                 472
+                  #@TestIssue                 none
                   #@TestPurpose               config-write privilege for Directory Manager - add global aci
                   #@TestPreamble              none
                   #@TestStep                  Directory Manager adds global ACI, default behavior.
@@ -1264,7 +1265,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  password-reset 
-                  #@TestIssue                 479
+                  #@TestIssue                 none
                   #@TestPurpose               password-reset privilege for Directory Manager
                   #@TestPreamble              none
                   #@TestStep                  Directory Manager resets user password, default behavior.
@@ -1371,7 +1372,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  update-schema 
-                  #@TestIssue                 468
+                  #@TestIssue                 none
                   #@TestPurpose               update-schema privilege for Directory Manager
                   #@TestPreamble              none
                   #@TestStep                  Alternate root user adds entry that uses new object class.
@@ -1517,7 +1518,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  privilege-change
-                  #@TestIssue                 1213
+                  #@TestIssue                 none
                   #@TestPurpose               privilege-change privilege for Directory Manager
                   #@TestPreamble              Alternate root user adding write ACI
                   #@TestStep                  Alternate root user removes privilege.
@@ -1699,7 +1700,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  server-shutdown
-                  #@TestIssue                 477
+                  #@TestIssue                 none
                   #@TestPurpose               server-shutdown privilege for Directory Manager
                   #@TestPreamble              none
                   #@TestStep                  Alternate root user removes privilege.
@@ -1834,7 +1835,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Directory Manager Tests
                   #@TestName                  server-restart
-                  #@TestIssue                 477
+                  #@TestIssue                 none
                   #@TestPurpose               server-restart privilege for Directory Manager
                   #@TestPreamble              none
                   #@TestStep                  Alternate root user removes privilege.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml
index bf9eb6e..1badbf8 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -76,7 +76,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Export Tasks Tests
                   #@TestName                  ldif-export
-                  #@TestIssue                 474
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for regular users to add export tasks
                   #@TestPreamble              none
                   #@TestStep                  User adding export task.
@@ -258,7 +258,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Export Tasks Tests
                   #@TestName                  ldif-export, Directory Manager
-                  #@TestIssue                 474
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for Directory Manager to add export tasks
                   #@TestPreamble              none
                   #@TestStep                  Directory Manager adding export task.
@@ -367,7 +367,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Export Tasks Tests
                   #@TestName                  ldif-export, New Root User
-                  #@TestIssue                 474
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for new root user to add export tasks
                   #@TestPreamble              Admin adds new root user.
                   #@TestStep                  New root user adding export task.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml
index 4430bab..be1b557 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS 
  ! -->
 <stax>
 
@@ -75,7 +76,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Import Tasks Tests
                   #@TestName                  ldif-import
-                  #@TestIssue                 474
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for regular users to add import tasks
                   #@TestPreamble              none
                   #@TestStep                  User adding import task.
@@ -233,7 +234,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Import Tasks Tests
                   #@TestName                  ldif-import, Directory Manager
-                  #@TestIssue                 474
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for Directory Manager to add import tasks
                   #@TestPreamble              none
                   #@TestStep                  Alternative root user removing privilege from Directory Manager.
@@ -356,7 +357,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Import Task Tests
                   #@TestName                  ldif-import, New Root User
-                  #@TestIssue                 474
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for new root user to add import tasks
                   #@TestPreamble              Admin adds new root user.
                   #@TestStep                  Alternative root user removing privilege from new root user.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
index a3b64a9..845f0e8 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -75,7 +76,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  preamble 
-                  #@TestIssue                 468
+                  #@TestIssue                 none
                   #@TestPurpose               Preamble - add a new root user
                   #@TestPreamble              none
                   #@TestStep                  Admin adds a new root user.
@@ -110,7 +111,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  bypass-acl 
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               bypass-acl privilege for new root user
                   #@TestPreamble              Alternate root user removes global search ACI.
                   #@TestStep                  New root user searches entry.
@@ -300,7 +301,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  bypass-acl, alternate bind DN
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               bypass-acl privilege for new root user using alternate bind dn
                   #@TestPreamble              Alternate root user removes global search ACI.
                   #@TestStep                  New root user searches entry.
@@ -421,7 +422,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  modify-acl - add aci
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               modify-acl privilege for new root user - add aci
                   #@TestPreamble              none
                   #@TestStep                  New root user adds ACI, default behavior.
@@ -565,7 +566,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  modify-acl - replace aci
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               modify-acl privilege for new root user - replace aci
                   #@TestPreamble              none
                   #@TestStep                  New root user replaces ACI, default behavior.
@@ -673,7 +674,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  modify-acl - delete aci
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               modify-acl privilege for new root user - delete aci
                   #@TestPreamble              none
                   #@TestStep                  New root user deletes ACI, default behavior.
@@ -769,7 +770,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  config-read 
-                  #@TestIssue                 472
+                  #@TestIssue                 none
                   #@TestPurpose               config-read privilege for new root user
                   #@TestPreamble              none
                   #@TestStep                  New root user searches cn=config, default behavior.
@@ -899,7 +900,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  config-write 
-                  #@TestIssue                 472
+                  #@TestIssue                 none
                   #@TestPurpose               config-write privilege for new root user
                   #@TestPreamble              none
                   #@TestStep                  New root user modifies cn=config, default behavior.
@@ -1071,7 +1072,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  config-write - add global aci
-                  #@TestIssue                 472
+                  #@TestIssue                 none
                   #@TestPurpose               config-write privilege for new root user - add global aci
                   #@TestPreamble              none
                   #@TestStep                  New root user adds global ACI, default behavior.
@@ -1265,7 +1266,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  password-reset 
-                  #@TestIssue                 479
+                  #@TestIssue                 none
                   #@TestPurpose               password-reset privilege for new root user
                   #@TestPreamble              none
                   #@TestStep                  New root user resets user password, default behavior.
@@ -1369,7 +1370,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  update-schema 
-                  #@TestIssue                 468
+                  #@TestIssue                 none
                   #@TestPurpose               update-schema privilege for new root user
                   #@TestPreamble              none
                   #@TestStep                  Alternate root user adds entry that uses new object class.
@@ -1509,7 +1510,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  privilege-change
-                  #@TestIssue                 1213
+                  #@TestIssue                 none
                   #@TestPurpose               privilege-change privilege for new root user
                   #@TestPreamble              Alternate root user adding write ACI
                   #@TestStep                  Alternate root user removes privilege.
@@ -1684,7 +1685,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  server-shutdown
-                  #@TestIssue                 477
+                  #@TestIssue                 none
                   #@TestPurpose               server-shutdown privilege for new root user
                   #@TestPreamble              none
                   #@TestStep                  Alternate root user removes privilege.
@@ -1817,7 +1818,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges New Root User Tests
                   #@TestName                  server-restart
-                  #@TestIssue                 477
+                  #@TestIssue                 none
                   #@TestPurpose               server-restart privilege for new root user
                   #@TestPreamble              none
                   #@TestStep                  Alternate root user removes privilege.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml
index 3d46de2..e7d5280 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -76,7 +76,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Restore Tasks Tests
                   #@TestName                  backend-restore
-                  #@TestIssue                 475
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for regular users to add restore tasks
                   #@TestPreamble              Admin add import task to add entries.
                   #@TestStep                  Admin adding backup task.
@@ -266,7 +266,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Restore Tasks Tests
                   #@TestName                  backend-restore, Directory Manager
-                  #@TestIssue                 475
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for Directory Manager to add restore tasks
                   #@TestPreamble              Alternative root user add import task to add entries.
                   #@TestStep                  Alternative root user adding backup task.
@@ -436,7 +436,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Restore Tasks Tests
                   #@TestName                  backend-restore, New User Root
-                  #@TestIssue                 475
+                  #@TestIssue                 none
                   #@TestPurpose               Privileges for new root user to add restore tasks
                   #@TestPreamble              Alternative root user adding new root user.
                   #@TestStep                  Alternative root user add import task to add entries.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
index 10b7f9f..d9e824f 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
- !      Portions Copyright 2011 Forgerock AS
+ !      Portions Copyright 2011-2013 Forgerock AS
  ! -->
 <stax>
 
@@ -76,7 +76,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  bypass-acl 
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               bypass-acl privilege for normal users
                   #@TestPreamble              User searches entry.
                   #@TestStep                  Admin removes global search ACI.
@@ -279,7 +279,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  bypass-acl with proxy 
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               bypass-acl privilege for normal users with proxy permission
                   #@TestPreamble              Admin removes global search ACI.
                   #@TestStep                  Admin adds privilege.
@@ -518,7 +518,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  bypass-acl removal with minus notation
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               bypass-acl privilege for normal users with minus notation
                   #@TestPreamble              Admin removes global search ACI.
                   #@TestStep                  Admin adds privilege.
@@ -753,7 +753,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  bypass-acl self-modify add
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               bypass-acl privilege for normal users with self-modify add
                   #@TestPreamble              Admin removes global search ACI.
                   #@TestStep                  User adds ACI to itself.
@@ -868,7 +868,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  modify-acl - add aci
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               modify-acl privilege for normal users - add aci
                   #@TestPreamble              none
                   #@TestStep                  User adds ACI, check default behavior.
@@ -1074,7 +1074,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  modify-acl - add aci - disable privilege
-                  #@TestIssue                 1683
+                  #@TestIssue                 none
                   #@TestPurpose               disable privilege for modify-acl privilege for normal users - add aci
                   #@TestPreamble              none
                   #@TestStep                  Admin adds write ACI.
@@ -1258,7 +1258,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  modify-acl - replace aci
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               modify-acl privilege for normal users - replace aci
                   #@TestPreamble              none
                   #@TestStep                  User replaces ACI, check default behavior.
@@ -1440,7 +1440,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  modify-acl - delete aci
-                  #@TestIssue                 471
+                  #@TestIssue                 none
                   #@TestPurpose               modify-acl privilege for normal users - delete aci
                   #@TestPreamble              none
                   #@TestStep                  User deletes ACI, check default behavior.
@@ -1586,7 +1586,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  config-read 
-                  #@TestIssue                 472
+                  #@TestIssue                 none
                   #@TestPurpose               config-read privilege for normal users
                   #@TestPreamble              none
                   #@TestStep                  User searches cn=config, check default behavior.
@@ -1718,7 +1718,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  config-read - disable privilege
-                  #@TestIssue                 1683
+                  #@TestIssue                 none
                   #@TestPurpose               config-read privilege for normal users
                   #@TestPreamble              none
                   #@TestStep                  User searches cn=config, check default behavior.
@@ -1847,7 +1847,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  config-write 
-                  #@TestIssue                 472
+                  #@TestIssue                 none
                   #@TestPurpose               config-write privilege for normal users
                   #@TestPreamble              none
                   #@TestStep                  User modifies cn=config, check default behavior.
@@ -2093,7 +2093,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  config-write - add global aci
-                  #@TestIssue                 472
+                  #@TestIssue                 none
                   #@TestPurpose               config-write privilege for normal users - add global aci
                   #@TestPreamble              none
                   #@TestStep                  User adds global ACI, check default behavior.
@@ -2363,7 +2363,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  password-reset 
-                  #@TestIssue                 479
+                  #@TestIssue                 none
                   #@TestPurpose               config-write privilege for normal users
                   #@TestPreamble              Admin adds write ACI
                   #@TestStep                  User resets another users password, check default behavior.
@@ -2553,7 +2553,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  update-schema 
-                  #@TestIssue                 468
+                  #@TestIssue                 none
                   #@TestPurpose               update-schema privilege for normal users
                   #@TestPreamble              Admin adds write ACI
                   #@TestStep                  User adds new schema object, check default behavior.
@@ -2782,7 +2782,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  privilege-change
-                  #@TestIssue                 1213
+                  #@TestIssue                 none
                   #@TestPurpose               privilege-change privilege for normal users
                   #@TestPreamble              Admin adds write ACI
                   #@TestStep                  Admin adds privilege-change privilege to first user.
@@ -2938,7 +2938,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  server-shutdown
-                  #@TestIssue                 477
+                  #@TestIssue                 none
                   #@TestPurpose               server-shutdown privilege for normal users
                   #@TestPreamble              none
                   #@TestStep                  User adds shutdown task, check default behavior.
@@ -3127,7 +3127,7 @@
                   The tag, TestMarker, must be the same as the tag, TestSuiteName.
                   #@TestMarker                Privileges Users Tests
                   #@TestName                  server-restart
-                  #@TestIssue                 477
+                  #@TestIssue                 none
                   #@TestPurpose               server-restart privilege for normal users
                   #@TestPreamble              none
                   #@TestStep                  User adds restart task, check default behavior.
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 d5afc5e..a1f0380 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
@@ -7383,13 +7383,6 @@
                         <message log="1" level="'Error'">
                          'Expected some ECL entry but NO ENTRY returned'
                         </message>
-                        <!-- We may have come across issue CR 6954670:
-                         !   ECL - draft: update ECL-disabled suffix, then
-                         !   non-disabled suffix, make lastChangenumber
-                         !   incoherent --> 
-                        <call function="'setKnownIssue'">
-                          { 'issueId' : 6954670 }
-                        </call>
                       </sequence>
                     </else>
                   </if>
@@ -7643,13 +7636,6 @@
                         <message log="1" level="'Error'">
                          'Expected some ECL entry but NO ENTRY returned'
                         </message>
-                        <!-- We may have come across issue CR 6954670:
-                         !   ECL - draft: update ECL-disabled suffix, then
-                         !   non-disabled suffix, make lastChangenumber
-                         !   incoherent --> 
-                        <call function="'setKnownIssue'">
-                          { 'issueId' : 6954670 }
-                        </call>
                       </sequence>
                     </else>
                   </if>
@@ -7946,13 +7932,6 @@
                         <message log="1" level="'Error'">
                          'Expected some ECL entry but NO ENTRY returned'
                         </message>
-                        <!-- We may have come across issue CR 6954670:
-                         !   ECL - draft: update ECL-disabled suffix, then
-                         !   non-disabled suffix, make lastChangenumber
-                         !   incoherent --> 
-                        <call function="'setKnownIssue'">
-                          { 'issueId' : 6954670 }
-                        </call>
                       </sequence>
                     </else>
                   </if>
@@ -8243,13 +8222,6 @@
                         <message log="1" level="'Error'">
                          'Expected some ECL entry but NO ENTRY returned'
                         </message>
-                        <!-- We may have come across issue CR 6954670:
-                         !   ECL - draft: update ECL-disabled suffix, then
-                         !   non-disabled suffix, make lastChangenumber
-                         !   incoherent --> 
-                        <call function="'setKnownIssue'">
-                          { 'issueId' : 6954670 }
-                        </call>
                       </sequence>
                     </else>
                   </if>
@@ -8518,13 +8490,6 @@
                         <message log="1" level="'Error'">
                          'Expected some ECL entry but NO ENTRY returned'
                         </message>
-                        <!-- We may have come across issue CR 6954670:
-                         !   ECL - draft: update ECL-disabled suffix, then
-                         !   non-disabled suffix, make lastChangenumber
-                         !   incoherent --> 
-                        <call function="'setKnownIssue'">
-                          { 'issueId' : 6954670 }
-                        </call>
                       </sequence>
                     </else>
                   </if>
@@ -8870,13 +8835,6 @@
                         <message log="1" level="'Error'">
                          'Expected some ECL entry but NO ENTRY returned'
                         </message>
-                        <!-- We may have come across issue CR 6954670:
-                         !   ECL - draft: update ECL-disabled suffix, then
-                         !   non-disabled suffix, make lastChangenumber
-                         !   incoherent --> 
-                        <call function="'setKnownIssue'">
-                          { 'issueId' : 6954670 }
-                        </call>
                       </sequence>
                     </else>
                   </if>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml b/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
index a59d67e..bea5ca0 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
   <defaultcall function="main_sample" />
@@ -177,7 +178,7 @@
               'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
               'dsBaseDN'         : DIRECTORY_INSTANCE_SFX  ,
               'dsFilter'         : 'wrongfilter' ,
-              'knownIssue'       : '2619'         }
+              'knownIssue'       : 'xyz'         }
             </call>
             <call function="'testCase_Postamble'" />
           </sequence>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic_tests.xml
index 16faf13..afe04a8 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic_tests.xml
@@ -35,7 +35,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                Dynamic Schema Tests
     #@TestName                  Update via a file
-    #@TestIssue                 367
+    #@TestIssue                 none
     #@TestPurpose               To make sure the schema can be updated by a file.
     #@TestPreamble              none
     #@TestStep                  Create a task that will cause the server to 
@@ -131,7 +131,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                Dynamic Schema Tests
     #@TestName                  Update Over Protocol: Add schema object
-    #@TestIssue                 366
+    #@TestIssue                 none
     #@TestPurpose               To verify the schema can be updated over protocol.
     #@TestPreamble              none
     #@TestStep                  Update the schema over protocol adding 
@@ -227,7 +227,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                Dynamic Schema Tests
     #@TestName                  Update Over Protocol: Replace  Schema Object
-    #@TestIssue                 366
+    #@TestIssue                 none
     #@TestPurpose               To verify attributes and objectclasses can be replaced over protocol.
     #@TestPreamble              none
     #@TestStep                  Update the schema over protocol by replacing  
@@ -323,7 +323,7 @@
     The tag, TestMarker, must be the same as the tag, TestSuiteName.
     #@TestMarker                Dynamic Schema Tests
     #@TestName                  Update Over Protocol: Remove Schema Object 
-    #@TestIssue                 366
+    #@TestIssue                 none
     #@TestPurpose               To verify attributes and objectclasses can be removed over protocol.
     #@TestPreamble              none
     #@TestStep                  Update the schema over protocol by removing
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
index 1ffd2ab..f5d1b51 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax MD5 Policy Tests
             #@TestName                  Auth Pwd Syntax MD5 Policy  Preamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add MD5 password policy
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax MD5 Policy Tests
             #@TestName                  Add New Users
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new users that use authPassword
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -148,7 +149,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax MD5 Policy Tests
             #@TestName                  Add New User Without authpasswordobject
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new a user without the authpasswordobject
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -201,7 +202,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax MD5 Policy Tests
             #@TestName                  Add New User Without password policy defined
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new a user without the password policy defined
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -253,7 +254,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax MD5 Policy Tests
             #@TestName                  Auth Pwd Syntax MD5 Policy  Postamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
index b0e24ae..37396c4 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA1 Policy Tests
             #@TestName                  Auth Pwd Syntax SHA1 Policy  Preamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add SHA1 password policy
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -79,7 +80,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA1 Policy Tests
             #@TestName                  Add New Users
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new users that use authPassword
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -147,7 +148,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA1 Policy Tests
             #@TestName                  Add New User Without authpasswordobject
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new a user without the authpasswordobject
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -199,7 +200,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA1 Policy Tests
             #@TestName                  Add New User Without password policy defined
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new a user without the password policy defined
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -249,7 +250,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA1 Policy Tests
             #@TestName                  Auth Pwd Syntax SHA1 Policy  Postamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
index 4078f08..b2f17f8 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA256 Policy Tests
             #@TestName                  Auth Pwd Syntax SHA256 Policy  Preamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add SHA256 password policy
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -78,7 +79,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA256 Policy Tests
             #@TestName                  Add New Users
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new users that use authPassword
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -144,7 +145,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA256 Policy Tests
             #@TestName                  Add New User Without authpasswordobject
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new a user without the authpasswordobject
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -196,7 +197,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA256 Policy Tests
             #@TestName                  Add New User Without password policy defined
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new a user without the password policy defined
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -248,7 +249,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA256 Policy Tests
             #@TestName                  Auth Pwd Syntax SHA256 Policy  Postamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
index 3ff920e..52e2425 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA384 Policy Tests
             #@TestName                  Auth Pwd Syntax SHA384 Policy  Preamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add SHA384 password policy
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -78,7 +79,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA384 Policy Tests
             #@TestName                  Add New Users
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new users that use authPassword
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -145,7 +146,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA384 Policy Tests
             #@TestName                  Add New User Without authpasswordobject
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new a user without the authpasswordobject
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -197,7 +198,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA384 Policy Tests
             #@TestName                  Add New User Without password policy defined
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new a user without the password policy defined
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -249,7 +250,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA384 Policy Tests
             #@TestName                  Auth Pwd Syntax SHA384 Policy  Postamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
index 92da6a5..c7e5a49 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA512 Policy Tests
             #@TestName                  Auth Pwd Syntax SHA512 Policy  Preamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add SHA512 password policy
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -78,7 +79,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA512 Policy Tests
             #@TestName                  Add New Users
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new users that use authPassword
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -144,7 +145,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA512 Policy Tests
             #@TestName                  Add New User Without authpasswordobject
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new a user without the authpasswordobject
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -197,7 +198,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA512 Policy Tests
             #@TestName                  Add New User Without password policy defined
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new a user without the password policy defined
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -248,7 +249,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax SHA512 Policy Tests
             #@TestName                  Auth Pwd Syntax SHA512 Policy  Postamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
index ffefe14..9331fe1 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax Default Policy Tests
             #@TestName                  Auth Pwd Syntax Default Policy  Preamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Check for existence of default password policy
             #@TestPreamble              none
             #@TestStep                  Client modifies the default password policy.
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax Default Policy Tests
             #@TestName                  Add New Users
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Add new users that use authPassword
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -151,7 +152,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Auth Pwd Syntax Default Policy Tests
             #@TestName                  Auth Pwd Syntax Default Policy  Postamble
-            #@TestIssue                 319
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
index a9d995a..5d7683c 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -48,7 +49,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Teardown Tests
             #@TestName                  JKS Teardown Test 
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Unconfigure JKS keystore.
             #@TestPreamble              none
             #@TestStep                  Delete entries that were used for the JKS tests.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
index 26c5462..d67c1ae 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -49,7 +50,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 1
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Add entries through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -85,7 +86,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 2
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Add an RDN to an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -120,7 +121,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 3
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Add a jpeg photo to an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -155,7 +156,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 4
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Replace a jpeg photo in an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -190,7 +191,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 5
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Delete an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -225,7 +226,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 6
-            #@TestIssue                 1830
+            #@TestIssue                 none
             #@TestPurpose               List properties using dsconfig.
             #@TestPreamble              none
             #@TestStep                  Client calls dsconfig
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
index 86b19cf..ce0ca21 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -49,7 +50,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 1
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Add entries through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -85,7 +86,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 2
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Add an RDN to an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -120,7 +121,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 3
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Add a jpeg photo to an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -155,7 +156,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 4
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Replace a jpeg photo in an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -190,7 +191,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 5
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Delete an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -225,7 +226,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                JKS Tests
             #@TestName                  JKS Bob Test 6
-            #@TestIssue                 1830
+            #@TestIssue                 none
             #@TestPurpose               List properties using dsconfig.
             #@TestPreamble              none
             #@TestStep                  Client calls dsconfig
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
index 13a6d71..68e1945 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -50,7 +51,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Setup Tests
             #@TestName                  JKS Startup Test 
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Setup OpenDS for JKS keystore.
             #@TestPreamble              none
             #@TestStep                  Generate server certificate.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
index 2d74eb9..bb6805f 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -50,7 +51,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Setup Tests
             #@TestName                  JKS Startup Test 
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Setup OpenDS for JKS keystore.
             #@TestPreamble              none
             #@TestStep                  Generate server certificate.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
index 00853e6..d94fcf0 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -48,7 +49,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Teardown Tests
             #@TestName                  JKS Teardown Test 
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Unconfigure JKS keystore.
             #@TestPreamble              none
             #@TestStep                  Delete entries that were used for the JKS tests.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
index 9f17fc5..1a23541 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -48,7 +49,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Teardown Tests
             #@TestName                  JKS Teardown Test 
-            #@TestIssue                 413
+            #@TestIssue                 none
             #@TestPurpose               Unconfigure JKS keystore.
             #@TestPreamble              none
             #@TestStep                  Delete entries that were used for the JKS tests.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
index 1fe6b6e..fc87781 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                PKCS12 Tests
             #@TestName                  PKCS12 Bob Test 1
-            #@TestIssue                 414
+            #@TestIssue                 none
             #@TestPurpose               Add entries through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                PKCS12 Tests
             #@TestName                  PKCS12 Bob Test 2
-            #@TestIssue                 414
+            #@TestIssue                 none
             #@TestPurpose               Add an RDN to an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -115,7 +116,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                PKCS12 Tests
             #@TestName                  PKCS12 Bob Test 3
-            #@TestIssue                 414
+            #@TestIssue                 none
             #@TestPurpose               Add a jpeg photo to an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -150,7 +151,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                PKCS12 Tests
             #@TestName                  PKCS12 Bob Test 4
-            #@TestIssue                 414
+            #@TestIssue                 none
             #@TestPurpose               Replace a jpeg photo in an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -185,7 +186,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                PKCS12 Tests
             #@TestName                  PKCS12 Bob Test 5
-            #@TestIssue                 414
+            #@TestIssue                 none
             #@TestPurpose               Delete an existing entry through a secure port.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -219,7 +220,7 @@
             The tag, TestMarker, be the same as the marker, TestSuiteName.
             #@TestMarker                PKCS12 Tests
             #@TestName                  PKCS12 Bob Test 6
-            #@TestIssue                 1830
+            #@TestIssue                 none
             #@TestPurpose               List properties using dsconfig.
             #@TestPreamble              none
             #@TestStep                  Client calls dsconfig
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
index dba8070..b16154b 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -50,7 +51,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Setup Tests
             #@TestName                  PKCS12 Startup Test 
-            #@TestIssue                 414
+            #@TestIssue                 none
             #@TestPurpose               Setup OpenDS for PKCS12 keystore.
             #@TestPreamble              none
             #@TestStep                  Generate server certificate.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
index 97c1c07..5e0532e 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -48,7 +49,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Teardown Tests
             #@TestName                  PKCS12 Teardown Test 
-            #@TestIssue                 414
+            #@TestIssue                 none
             #@TestPurpose               Unconfigure PKCS12 keystore.
             #@TestPreamble              none
             #@TestStep                  Delete entries that were used for the JKS tests.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
index 9517cbb..6431eb8 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -46,7 +47,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Multiple Schemes
             #@TestName                  Multiple Schemes Preamble
-            #@TestIssue                 322
+            #@TestIssue                 none
             #@TestPurpose               Add BASE64 password scheme
             #@TestPreamble              none
             #@TestStep                  Admin deletes Salted SHA-1.
@@ -142,7 +143,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Multiple Schemes
             #@TestName                  Check for SSHA Password Scheme
-            #@TestIssue                 322
+            #@TestIssue                 none
             #@TestPurpose               Test for the default SSHA scheme in the password policy
             #@TestPreamble              none
             #@TestStep                  Admin retrieve the value for 
@@ -188,7 +189,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Multiple Schemes
             #@TestName                  Check for BASE64 Password Scheme
-            #@TestIssue                 322
+            #@TestIssue                 none
             #@TestPurpose               Test for the BASE64 scheme in the password policy
             #@TestPreamble              none
             #@TestStep                  Admin retrieve the value for 
@@ -234,7 +235,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Multiple Schemes
             #@TestName                  Check for SHA-1 Password Scheme
-            #@TestIssue                 322
+            #@TestIssue                 none
             #@TestPurpose               Test for the SHA-1 scheme in the password policy
             #@TestPreamble              none
             #@TestStep                  Admin retrieve the value for 
@@ -280,7 +281,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Multiple Schemes
             #@TestName                  user Password Change
-            #@TestIssue                 322
+            #@TestIssue                 none
             #@TestPurpose               Test that a user's password is stored in the new schemes.
             #@TestPreamble              none
             #@TestStep                  User changes his password.
@@ -358,7 +359,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Multiple Schemes
             #@TestName                  User Password Change
-            #@TestIssue                 322
+            #@TestIssue                 none
             #@TestPurpose               Test that a user's password is stored in the new schemes.
             #@TestPreamble              none
             #@TestStep                  Admin retrieves userpassword from user entry and
@@ -404,7 +405,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Multiple Schemes
             #@TestName                  User Password Change
-            #@TestIssue                 322
+            #@TestIssue                 none
             #@TestPurpose               Test that a user's password is stored in the new schemes.
             #@TestPreamble              none
             #@TestStep                  Admin retrieves userpassword from user entry and
@@ -451,7 +452,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Multiple Schemes
             #@TestName                  User Improper Password Add
-            #@TestIssue                 322
+            #@TestIssue                 none
             #@TestPurpose               Test the response when a user improperly adds a password.
             #@TestPreamble              none
             #@TestStep                  User adds a pasword to his entry
@@ -487,7 +488,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                Multiple Schemes
             #@TestName                  Multiple Schemes Postamble
-            #@TestIssue                 322
+            #@TestIssue                 none
             #@TestPurpose               Reset back to SSHA storage scheme alone
             #@TestPreamble              none
             #@TestStep                  Admin create new SSHA password scheme.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
index 95b5ad0..f780772 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                3DES Tests
             #@TestName                  3DES Preamble
-            #@TestIssue                 315
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to 3DES.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                3DES Tests
             #@TestName                  3DES Test 1
-            #@TestIssue                 315
+            #@TestIssue                 none
             #@TestPurpose               Test 3DES password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -159,7 +160,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                3DES Tests
             #@TestName                  3DES Postamble
-            #@TestIssue                 315
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
index f50a40e..c7c40db 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                AES Tests
             #@TestName                  AES Preamble
-            #@TestIssue                 316
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to AES.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                AES Tests
             #@TestName                  AES Test 1
-            #@TestIssue                 316
+            #@TestIssue                 none
             #@TestPurpose               Test AES password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -159,7 +160,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                AES Tests
             #@TestName                  AES Postamble
-            #@TestIssue                 316
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
index 473eee5..7160a70 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                BASE64 Tests
             #@TestName                  BASE64 Preamble
-            #@TestIssue                 310
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to BASE64.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                BASE64 Tests
             #@TestName                  BASE64 Test 1
-            #@TestIssue                 310
+            #@TestIssue                 none
             #@TestPurpose               Test BASE64 password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -159,7 +160,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                BASE64 Tests
             #@TestName                  BASE64 Postamble
-            #@TestIssue                 310
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BLOWFISH.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BLOWFISH.xml
index 3f9e947..6a6be4c 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BLOWFISH.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BLOWFISH.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2009 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                BLOWFISH Tests
             #@TestName                  BLOWFISH Preamble
-            #@TestIssue                 318
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to BLOWFISH.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                BLOWFISH Tests
             #@TestName                  BLOWFISH Test 1
-            #@TestIssue                 318
+            #@TestIssue                 none
             #@TestPurpose               Test BLOWFISH password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -159,7 +160,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                BLOWFISH Tests
             #@TestName                  BLOWFISH Postamble
-            #@TestIssue                 318
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
index 8ed634f..12ffe5a 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                CLEAR Tests
             #@TestName                  CLEAR Preamble
-            #@TestIssue                 309
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to CLEAR.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -79,7 +80,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                CLEAR Tests
             #@TestName                  CLEAR Test 1
-            #@TestIssue                 309
+            #@TestIssue                 none
             #@TestPurpose               Test CLEAR password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -157,7 +158,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                CLEAR Tests
             #@TestName                  CLEAR Test 2
-            #@TestIssue                 309
+            #@TestIssue                 none
             #@TestPurpose               Test the actual CLEAR password for the user.
             #@TestPreamble              none
             #@TestStep                  Admin retrieves the user's password and 
@@ -199,7 +200,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                CLEAR Tests
             #@TestName                  CLEAR Postamble
-            #@TestIssue                 309
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
index 3a94164..ec1e1a0 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                CRYPT Tests
             #@TestName                  CRYPT Preamble
-            #@TestIssue                 311
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to CRYPT.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                CRYPT Tests
             #@TestName                  CRYPT Test 1
-            #@TestIssue                 311
+            #@TestIssue                 none
             #@TestPurpose               Test CRYPT password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -158,7 +159,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                CRYPT Tests
             #@TestName                  CRYPT Postamble
-            #@TestIssue                 311
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SCRYPT.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
index 7d2dd03..57be086 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                MD5 Tests
             #@TestName                  MD5 Preamble
-            #@TestIssue                 312
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to MD5.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                MD5 Tests
             #@TestName                  MD5 Test 1
-            #@TestIssue                 312
+            #@TestIssue                 none
             #@TestPurpose               Test MD5 password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -158,7 +159,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                MD5 Tests
             #@TestName                  MD5 Postamble
-            #@TestIssue                 312
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
index 17538b7..4014c41 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                RC4 Tests
             #@TestName                  RC4 Preamble
-            #@TestIssue                 317
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to RC4.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                RC4 Tests
             #@TestName                  RC4 Test 1
-            #@TestIssue                 317
+            #@TestIssue                 none
             #@TestPurpose               Test RC4 password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -159,7 +160,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                RC4 Tests
             #@TestName                  RC4 Postamble
-            #@TestIssue                 317
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
index adf7699..f428d45 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SHA Tests
             #@TestName                  SHA Preamble
-            #@TestIssue                 313
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to SHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SHA Tests
             #@TestName                  SHA Test 1
-            #@TestIssue                 313
+            #@TestIssue                 none
             #@TestPurpose               Test SHA password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -158,7 +159,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SHA Tests
             #@TestName                  SHA Postamble
-            #@TestIssue                 313
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
index cb21f63..083bd21 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SMD5 Tests
             #@TestName                  SMD5 Preamble
-            #@TestIssue                 312
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to SMD5.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SMD5 Tests
             #@TestName                  SMD5 Test 1
-            #@TestIssue                 312
+            #@TestIssue                 none
             #@TestPurpose               Test SMD5 password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -158,7 +159,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SMD5 Tests
             #@TestName                  SMD5 Postamble
-            #@TestIssue                 312
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
index 72cd2c1..a869f67 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA Tests
             #@TestName                  SSHA Preamble
-            #@TestIssue                 313
+            #@TestIssue                 none
             #@TestPurpose               Check for the default storage scheme. SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapcompare 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA Tests
             #@TestName                  SSHA Default Test
-            #@TestIssue                 313
+            #@TestIssue                 none
             #@TestPurpose               Test the default, SSHA, password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin retrieves a user's password and 
@@ -125,7 +126,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA Tests
             #@TestName                  SSHA Test 1
-            #@TestIssue                 313
+            #@TestIssue                 none
             #@TestPurpose               Test SSHA password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -203,7 +204,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA Tests
             #@TestName                  SSHA Unsupported Scheme Test
-            #@TestIssue                 313
+            #@TestIssue                 none
             #@TestPurpose               Test an unsupported storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes to an unsupported storage scheme.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
index 5f8ec72..9b7411a 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA256 Tests
             #@TestName                  SSHA256 Preamble
-            #@TestIssue                 314
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to SSHA256.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -79,7 +80,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA256 Tests
             #@TestName                  SSHA256 Test 1
-            #@TestIssue                 314
+            #@TestIssue                 none
             #@TestPurpose               Test SSHA256 password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -157,7 +158,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA256 Tests
             #@TestName                  SSHA256 Postamble
-            #@TestIssue                 314
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
index 5dba9e5..d116309 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA384 Tests
             #@TestName                  SSHA384 Preamble
-            #@TestIssue                 314
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to SSHA384.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -79,7 +80,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA384 Tests
             #@TestName                  SSHA384 Test 1
-            #@TestIssue                 314
+            #@TestIssue                 none
             #@TestPurpose               Test SSHA384 password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -157,7 +158,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA384 Tests
             #@TestName                  SSHA384 Postamble
-            #@TestIssue                 314
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
index f5e2445..450ceb6 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2006-2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA512 Tests
             #@TestName                  SSHA512 Preamble
-            #@TestIssue                 314
+            #@TestIssue                 none
             #@TestPurpose               Change password storage scheme to SSHA512.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -80,7 +81,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA512 Tests
             #@TestName                  SSHA512 Test 1
-            #@TestIssue                 314
+            #@TestIssue                 none
             #@TestPurpose               Test SSHA512 password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
@@ -158,7 +159,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SSHA512 Tests
             #@TestName                  SSHA512 Postamble
-            #@TestIssue                 314
+            #@TestIssue                 none
             #@TestPurpose               Reset password storage scheme to the default, SSHA.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
index 498bd43..682a160 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2008 Sun Microsystems, Inc.
- !      Portions Copyright 2011-2012 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -235,8 +235,7 @@
                     'propertyName'           : 'Dictionary' ,
                     'attributeName'          : 'test-reversed-password' ,
                     'attributeValue'         : 'false' ,
-                    'modifyType'             : 'set' ,
-                    'knownIssue'             : '2361' }
+                    'modifyType'             : 'set' }
             </call>
 
             <call function="'testCase_Postamble'"/>
@@ -272,8 +271,7 @@
                 'dsInstancePswd'   : 'tcilfni' ,
                 'dsBaseDN'         : 'dc=example,dc=com' ,
                 'dsFilter'         : 'objectclass=*'  ,
-                'extraParams'      : '-s base' ,
-                'knownIssue'       : '2361' }
+                'extraParams'      : '-s base' }
             </call>
 
             <call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
index 87056c6..27f2dbb 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL ANONYMOUS Tests
             #@TestName                  SASL ANONYMOUS Preamble
-            #@TestIssue                 351
+            #@TestIssue                 none
             #@TestPurpose               Prepare for SASL ANONYMOUS tests.
             #@TestPreamble              none
             #@TestStep                  Admin enable SASL ANONYMOUS mechanism.
@@ -88,7 +89,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL ANONYMOUS Tests
             #@TestName                  Anonymous bind
-            #@TestIssue                 351
+            #@TestIssue                 none
             #@TestPurpose               Test anonymous bind.
             #@TestPreamble              none
             #@TestStep                  Anonymous bind to OpenDS.
@@ -121,7 +122,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL ANONYMOUS Tests
             #@TestName                  SASL ANONYMOUS Postamble
-            #@TestIssue                 351
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration.
             #@TestPreamble              none
             #@TestStep                  Admin disable SASL ANONYMOUS mechanism.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
index e87e1a8..726750a 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL CRAM-MD5 Tests
             #@TestName                  SASL CRAM-MD5 Preamble
-            #@TestIssue                 352
+            #@TestIssue                 none
             #@TestPurpose               Prepare for SASL CRAM-MD5 tests.
             #@TestPreamble              none
             #@TestStep                  Admin change password storage scheme to CLEAR.
@@ -118,7 +119,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL CRAM-MD5 Tests
             #@TestName                  uid (u:) Bind
-            #@TestIssue                 352
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format.
@@ -151,7 +152,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL CRAM-MD5 Tests
             #@TestName                  uid (dn:) Bind
-            #@TestIssue                 352
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a DN that has an authorization ID that could be mapped to a single DN.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[name] format.
@@ -184,7 +185,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL CRAM-MD5 Tests
             #@TestName                  Dupe uid (u:) Bind
-            #@TestIssue                 352
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format.
@@ -218,7 +219,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL CRAM-MD5 Tests
             #@TestName                  Dupe uid (dn:) Bind
-            #@TestIssue                 352
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to muliple DNs.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[DN] format.
@@ -251,7 +252,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL CRAM-MD5 Tests
             #@TestName                  Dupe uid (u:) Bind 2
-            #@TestIssue                 352
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs. Mutiple DNs are deleted.
             #@TestPreamble              none
             #@TestStep                  Admin deletes the entry whose authorization ID matches another DN.
@@ -298,7 +299,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL CRAM-MD5 Tests
             #@TestName                  SASL CRAM-MD5 Postamble
-            #@TestIssue                 352
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration.
             #@TestPreamble              none
             #@TestStep                  Admin change pasword storage scheme to SSHA.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
index 418f9dd..36bb9b4 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2009 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS
+ !      Portions Copyright 2011-2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -46,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  SASL DIGEST-MD5 Preamble
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Prepare for SASL DIGEST-MD5 tests.
             #@TestPreamble              none
             #@TestStep                  Admin change password storage scheme to
@@ -126,7 +126,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  Dupe uid (u:) Bind
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format.
@@ -160,7 +160,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (u:) Bind
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format.
@@ -193,7 +193,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (u:) Bind authzid
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN with authzid mapped to uid.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format with an authzid.
@@ -226,7 +226,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (u:) Bind another authzid
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN with another authzid.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format with an authzid of another unauthorized user.
@@ -260,7 +260,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (u:) Bind with authzid without authid
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind without an authorization ID but with an authzid.
             #@TestPreamble              none
             #@TestStep                  User bind without authid but with an authzid.
@@ -294,7 +294,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  Admin Change authzid Attribute
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test if authzid attribute may be changed
             #@TestPreamble              none
             #@TestStep                  Admin change authzid attribute to sn.
@@ -328,7 +328,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (u:) Bind authzid after attr change
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN with authzid mapped to uid.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format with an authzid using the default, uid.
@@ -362,7 +362,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (u:) Bind authzid after attr change 2
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN with authzid mapped to uid.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format with an authzid using sn.
@@ -395,7 +395,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  Admin Reset authzid Attribute
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test if authzid attribute may be reset
             #@TestPreamble              none
             #@TestStep                  Admin change authzid attribute to the default, uid
@@ -429,7 +429,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (u:) Bind authzid after attr reset
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN with authzid mapped to uid.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format with an authzid using the default, uid.
@@ -462,7 +462,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  Dupe uid (dn:) Bind
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to muliple DNs.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[DN] format.
@@ -495,7 +495,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  Dupe uid (dn:) Bind authzid
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to muliple DNs with an authzid that maps to multiple DNs.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[DN] format and with authzid.
@@ -529,7 +529,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (dn:) Bind
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to a single DN.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[DN] format.
@@ -562,7 +562,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  Create realm
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Admin add realm to SASL DIGEST-MD5 mechanism.
             #@TestPreamble              none
             #@TestStep                  ldapmodify used to add a realm.
@@ -596,7 +596,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  Dupe uid (u:) Bind With Realm
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs. Realm specified.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format 
@@ -631,7 +631,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (u:) Bind With Realm
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN. Realm specified.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format 
@@ -665,7 +665,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  Dupe uid (dn:) Bind With Realm
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to muliple DNs. Realm specified.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[DN] format 
@@ -699,7 +699,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (dn:) Bind With Realm
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to a single DN. Realm specified.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[DN] format 
@@ -733,7 +733,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  Dupe uid (u:) Bind With Undefined Realm
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs. Undefined realm specified.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format 
@@ -768,7 +768,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (u:) Bind With Undefined Realm
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN. Undefined realm specified.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format 
@@ -803,7 +803,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  Dupe uid (dn:) Bind With Undefined Realm
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to muliple DNs. Undefined realm specified.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[DN] format 
@@ -838,7 +838,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (dn:) Bind With Undefined Realm
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a user DN whose authorization ID could be mapped to a single DN. Undefined realm specified.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[DN] format 
@@ -872,7 +872,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (dn:) Bind with ACI with authmethod equal sasl
-            #@TestIssue                 460
+            #@TestIssue                 none
             #@TestPurpose               Test bind where an ACI authmethod equal sasl applies.
             #@TestPreamble              none
             #@TestStep                  User binds with sasl authetication and with authid=dn:[DN] format.
@@ -1108,7 +1108,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (dn:) Bind with ACI with authmethod equal simple
-            #@TestIssue                 460
+            #@TestIssue                 none
             #@TestPurpose               Test bind where an ACI authmethod equal simple applies.
             #@TestPreamble              none
             #@TestStep                  User binds with sasl authetication and with authid=dn:[DN] format.
@@ -1348,7 +1348,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (dn:) Bind with ACI with authmethod not equals simple
-            #@TestIssue                 460
+            #@TestIssue                 none
             #@TestPurpose               Test bind where an ACI authmethod not equals simple applies.
             #@TestPreamble              none
             #@TestStep                  User binds with sasl authetication and with authid=dn:[DN] format.
@@ -1588,7 +1588,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  uid (dn:) Bind with ACI with authmethod equals none
-            #@TestIssue                 460
+            #@TestIssue                 none
             #@TestPurpose               Test bind where an ACI authmethod equals none applies.
             #@TestPreamble              none
             #@TestStep                  User binds with sasl authetication and with authid=dn:[DN] format.
@@ -3191,12 +3191,9 @@
                 'authenticationId' : 'dn:%s' % test_user,
                 'strength'         : 'low',
                 'password'         : 'newleg',
-                'protection'       : 'auth-conf',
-                'knownIssue'       : '3967'
+                'protection'       : 'auth-conf'
               }
             </call>
-            <!-- Issue 3967: SASL encryption: cipher strength low not supported 
-                 with java 1.5 -->
                         
             <call function="'testCase_Postamble'"/>
             
@@ -3537,12 +3534,9 @@
                 'authenticationId' : 'dn:%s' % test_user,
                 'strength'         : 'low',
                 'password'         : 'newleg',
-                'protection'       : 'auth-conf',
-                'knownIssue'       : '3967'
+                'protection'       : 'auth-conf'
               }
             </call>
-            <!-- Issue 3967: SASL encryption: cipher strength low not supported 
-                 with java 1.5-->
 
             <script> 
               returnString = STAXResult[0][1]
@@ -4055,12 +4049,11 @@
               'Search result:   %s' % returnString
             </message>
 
-            <!-- #3723: SSF bind rule: != operator not working -->
+            <!-- SSF bind rule: != operator not working -->
             <call function="'searchString'">
               { 'returnString'   : returnString,
                 'expectedString' : 'uid=tmorris,ou=People',
-                'expectedRC'     : 1,
-                'knownIssue'     : '3723'
+                'expectedRC'     : 1
               }
             </call>
 
@@ -4141,12 +4134,10 @@
               'Search result:   %s' % returnString
             </message>
 
-            <!-- #3723: SSF bind rule: != operator not working -->
+            <!-- SSF bind rule: != operator not working -->
             <call function="'searchString'">
               { 'returnString'   : returnString,
-                'expectedString' : 'uid=tmorris,ou=People',
-                'expectedRC'     : 0,
-                'knownIssue'     : '3723'
+                'expectedString' : 'uid=tmorris,ou=People'
               }
             </call>
 
@@ -4215,12 +4206,9 @@
                 'authenticationId' : 'dn:%s' % test_user,
                 'strength'         : 'low',
                 'password'         : 'newleg',
-                'protection'       : 'auth-conf',
-                'knownIssue'       : '3967'
+                'protection'       : 'auth-conf'
               }
             </call>
-            <!-- Issue 3967: SASL encryption: cipher strength low not supported 
-                 with java 1.5-->
 
             <script> 
               returnString = STAXResult[0][1]
@@ -4230,12 +4218,10 @@
               'Search result:   %s' % returnString
             </message>
 
-            <!-- #3723: SSF bind rule: != operator not working -->
+            <!-- SSF bind rule: != operator not working -->
             <call function="'searchString'">
               { 'returnString'   : returnString,
-                'expectedString' : 'uid=tmorris,ou=People',
-                'expectedRC'     : 0,
-                'knownIssue'     : '3723'
+                'expectedString' : 'uid=tmorris,ou=People'
               }
             </call>
 
@@ -4572,7 +4558,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL DIGEST-MD5 Tests
             #@TestName                  SASL DIGEST-MD5 Postamble
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration and entries.
             #@TestPreamble              none
             #@TestStep                  Admin change password storage scheme to SSHA.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
index 7c42cf1..2aca63d 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL New Tests
             #@TestName                  SASL New Preamble
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Prepare for SASL New tests.
             #@TestPreamble              none
             #@TestStep                  User change his password.
@@ -136,7 +137,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL New Tests
             #@TestName                  uid (u:) Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format.
@@ -170,7 +171,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL New Tests
             #@TestName                  uid Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=[name] format.
@@ -203,7 +204,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL New Tests
             #@TestName                  uid (dn:) Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a DN that has an authorization ID that could be mapped to a single DN. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[name] format.
@@ -236,7 +237,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL New Tests
             #@TestName                  Dupe uid (u:) Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format.
@@ -270,7 +271,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL New Tests
             #@TestName                  Dupe uid (dn:) Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a DN that has an authorization ID that could be mapped to multiple DNs. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[name] format.
@@ -303,7 +304,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL New Tests
             #@TestName                  Dupe uid Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a DN that has an authorization ID that could be mapped to multiple DNs. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=[dn] format.
@@ -337,7 +338,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL New Tests
             #@TestName                  SASL New Postamble
-            #@TestIssue                 1240
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration and entries.
             #@TestPreamble              none
             #@TestStep                  Admin change password storage scheme to SSHA.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
index 641daa3..8bb9fff 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -45,7 +46,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL PLAIN Tests
             #@TestName                  SASL PLAIN Preamble
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Prepare for SASL PLAIN tests.
             #@TestPreamble              none
             #@TestStep                  User change his password.
@@ -93,7 +94,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL PLAIN Tests
             #@TestName                  uid (u:) Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format.
@@ -127,7 +128,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL PLAIN Tests
             #@TestName                  uid Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=[name] format.
@@ -160,7 +161,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL PLAIN Tests
             #@TestName                  uid (dn:) Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a DN that has an authorization ID that could be mapped to a single DN. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[name] format.
@@ -193,7 +194,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL PLAIN Tests
             #@TestName                  Dupe uid (u:) Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to multiple DNs. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format.
@@ -227,7 +228,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL PLAIN Tests
             #@TestName                  Dupe uid (dn:) Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a DN that has an authorization ID that could be mapped to multiple DNs. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=dn:[name] format.
@@ -260,7 +261,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL PLAIN Tests
             #@TestName                  Dupe uid Bind
-            #@TestIssue                 353
+            #@TestIssue                 none
             #@TestPurpose               Test bind using a DN that has an authorization ID that could be mapped to multiple DNs. 
             #@TestPreamble              none
             #@TestStep                  User bind with authid=[dn] format.
@@ -294,7 +295,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL PLAIN Tests
             #@TestName                  Create realm
-            #@TestIssue                 345
+            #@TestIssue                 none
             #@TestPurpose               Admin add realm to SASL PLAIN mechanism.
             #@TestPreamble              none
             #@TestStep                  ldapmodify used to add a realm.
@@ -338,7 +339,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL PLAIN Tests
             #@TestName                  uid (u:) Bind with realm
-            #@TestIssue                 1240
+            #@TestIssue                 none
             #@TestPurpose               Test bind using an authorization ID that could be mapped to a single DN. Bind with realm.
             #@TestPreamble              none
             #@TestStep                  User bind with authid=u:[name] format.
@@ -372,7 +373,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                SASL PLAIN Tests
             #@TestName                  SASL PLAIN Postamble
-            #@TestIssue                 1240
+            #@TestIssue                 none
             #@TestPurpose               Reset configuration and entries.
             #@TestPreamble              none
             #@TestStep                  Admin change password storage scheme to SSHA.
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
index 0895736..48dbf31 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS
+ !      Portions Copyright 2011-2013 ForgeRock AS
  ! -->
 <stax>
   
@@ -223,8 +223,7 @@
               'dsBaseDN'        : "o=o2",
               'dsFilter'        : 'objectclass=*',
               'dsAttributes'    : 'dn',
-              'expectedRC'      : 0,
-              'knownIssue'      : '4212'
+              'expectedRC'      : 0
             }
           </call>
           
diff --git a/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml b/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
index 293050a..6155740 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2009 Sun Microsystems, Inc.
- !      Portions Copyright 2011 Forgerock AS
+ !      Portions Copyright 2011-2013 Forgerock AS
  ! -->
 
 <stax>
@@ -864,8 +864,7 @@
                 <call function="'searchString'">
                   {
                   'expectedString' : '%s' % descDefaultValue ,
-                  'returnString'   : ldapsearchReturn ,
-                  'knownIssue'     : '3779'
+                  'returnString'   : ldapsearchReturn
                   }
                 </call>
   
diff --git a/opends/tests/staf-tests/shared/functions/topology.xml b/opends/tests/staf-tests/shared/functions/topology.xml
index a7981a4..b014a40 100755
--- a/opends/tests/staf-tests/shared/functions/topology.xml
+++ b/opends/tests/staf-tests/shared/functions/topology.xml
@@ -24,7 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2007-2010 Sun Microsystems, Inc.
- !      Portions Copyright 2011 ForgeRock AS.
+ !      Portions Copyright 2011-2013 ForgeRock AS.
  ! -->
 <stax>
   <function name="createTopology">
@@ -638,20 +638,7 @@
         { 'location' : syncserver.getHostname(),
            'dsPath'  : syncserverPath
          }
-      </call>
-        
-      <!-- WORK-AROUND for issue #2201 -->
-      <call function="'addEntry'">
-        { 'location'       : syncserver.getHostname(),
-          'dsPath'         : syncserverPath,
-          'dsInstanceHost' : syncserver.getHostname(),
-          'dsInstancePort' : syncserver.getPort(), 
-          'dsInstanceDn'   : syncserver.getRootDn(),
-          'dsInstancePswd' : syncserver.getRootPwd(),
-          'entryToBeAdded' : '%s/%s/replication/workaround-2201.ldif' \
-                             % (syncserver.getDir(),remote.reldatadir)
-        }
-      </call>        
+      </call>  
       
       <message>
         'List synchronization providers'
@@ -1173,15 +1160,12 @@
                     
         STAFCmdParams=' '.join(STAFCmdParamsList)
       </script>
-      <!-- dsreplication initialize(-all) may fail due to issue:
-       !   #4495: dsreplication initialization produces error message-->
       <call function="'runCommand'">
         { 'name'       : 'Initialize Replication',
           'location'   : location,
           'command'    : STAFCmd,
           'arguments'  : STAFCmdParams,
-          'expectedRC' : expectedRC,
-          'knownIssue' : '4495'
+          'expectedRC' : expectedRC
         }
       </call>
       <return>
@@ -1688,14 +1672,11 @@
                     
         STAFCmdParams=' '.join(STAFCmdParamsList)
       </script>
-      <!-- dsreplication pre-external-initialization may fail due to issue:
-       !   #4495: dsreplication initialization produces error message-->
       <call function="'runCommand'">
         { 'name'       : 'Pre-Initialize Replication',
           'location'   : location,
           'command'    : STAFCmd,
-          'arguments'  : STAFCmdParams,
-          'knownIssue' : '4495'
+          'arguments'  : STAFCmdParams
         }
       </call>
       <script>
@@ -1834,14 +1815,11 @@
                     
         STAFCmdParams=' '.join(STAFCmdParamsList)
       </script>
-      <!-- dsreplication post-external-initialization may fail due to issue:
-       !   #4495: dsreplication initialization produces error message-->
       <call function="'runCommand'">
         { 'name'       : 'Post-Initialize Replication',
           'location'   : location,
           'command'    : STAFCmd,
-          'arguments'  : STAFCmdParams,
-          'knownIssue' : '4495'
+          'arguments'  : STAFCmdParams
         }
       </call>
       <script>
@@ -2400,8 +2378,7 @@
                                               'dsInstanceDn'    : directoryServer.dn        ,
                                               'dsInstancePswd'  : directoryServer.password  ,
                                               'dsDn'            : ['%s' % server.suffix]    ,
-                                              'expectedRC'      : 'noCheck'                 ,
-                                              'knownIssue'      : '6917970' }
+                                              'expectedRC'      : 'noCheck' }
                     }
                   </call>
                 </sequence>
diff --git a/opends/tests/staf-tests/shared/java/parsingtool/README b/opends/tests/staf-tests/shared/java/parsingtool/README
index d5d7d5c..029526f 100644
--- a/opends/tests/staf-tests/shared/java/parsingtool/README
+++ b/opends/tests/staf-tests/shared/java/parsingtool/README
@@ -23,6 +23,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2013 ForgeRock AS
  */
 
 The purpose of the parsing tool is to parse comments from the functional test xml files.
@@ -123,7 +124,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                MD5 Tests
             #@TestName                  MD5 Preamble
-            #@TestIssue                 312
+            #@TestIssue                 xyz
             #@TestPurpose               Change password storage scheme to MD5.
             #@TestPreamble              none
             #@TestStep                  Client calls ldapmodify 
@@ -141,7 +142,7 @@
             The tag, TestMarker, must be the same as the tag, TestSuiteName.
             #@TestMarker                MD5 Tests
             #@TestName                  MD5 Test 1
-            #@TestIssue                 312
+            #@TestIssue                 xyz
             #@TestPurpose               Test MD5 password storage scheme.
             #@TestPreamble              none
             #@TestStep                  Admin changes a user's password to convert 
diff --git a/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml
index 5869b44..2be97f9 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2009-2010 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS
  ! -->
 <stax>
 
@@ -369,8 +370,7 @@
               <call function="'rebuildIndexWithScript'">
                 {
                 'dsBaseDN'            : 'dc=com' ,
-                'dsRebuildAll'        : 'True' ,
-                'knownIssue'          : '6928546'
+                'dsRebuildAll'        : 'True'
                 }
               </call>
 
diff --git a/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml
index 2307f85..9924147 100755
--- a/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -145,10 +146,6 @@
                       'expectedString'     : 'Processed 100002 entries' }
                 </call>
                 
-                <!--<call function="'setKnownIssue'">
-                    { 'issueId' : '2535' }
-                </call>-->
-                
                 <call function="'testCase_Postamble'"/>
     
               </sequence>
@@ -200,10 +197,6 @@
                   'startDS'         : 'no'
                 }
                 </call>
-              
-                <!--<call function="'setKnownIssue'">
-                    { 'issueId' : '2535' }
-                </call>-->
                 
                 <call function="'testCase_Postamble'"/>
     
diff --git a/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml
index aa8497e..37a34d7 100755
--- a/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -157,10 +158,6 @@
                       'expectedString'     : 'Processed 100002 entries' }
                 </call>
                 
-                <!--<call function="'setKnownIssue'">
-                    { 'issueId' : '2535' }
-                </call>-->
-                
                 <call function="'testCase_Postamble'"/>
     
               </sequence>
@@ -212,10 +209,6 @@
                   'startDS'         : 'no'
                 }
                 </call>
-              
-                <!--<call function="'setKnownIssue'">
-                    { 'issueId' : '2535' }
-                </call>-->
                 
                 <call function="'testCase_Postamble'"/>
     
diff --git a/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml
index e1ff6b9..677e125 100755
--- a/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml
@@ -24,6 +24,7 @@
  ! CDDL HEADER END
  !
  !      Copyright 2008-2010 Sun Microsystems, Inc.
+ !      Portions Copyright 2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -117,10 +118,6 @@
                   'result'     : STAXResult 
                 }
               </call>
-              
-              <call function="'setKnownIssue'">
-                    { 'issueId' : '2262' }
-              </call>
 
               <call function="'testCase_Postamble'"/>
     
diff --git a/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks_tests.xml b/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks_tests.xml
index b8ff6f9..cc25019 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks_tests.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks_tests.xml
@@ -23,7 +23,7 @@
  !
  ! CDDL HEADER END
  !
- !      Copyright 2012 ForgeRock AS.
+ !      Copyright 2012-2013 ForgeRock AS.
  ! -->
 <stax>
 
@@ -110,10 +110,6 @@
                 'result'     : STAXResult 
               }
             </call>
-            
-            <call function="'setKnownIssue'">
-                  { 'issueId' : '2262' }
-            </call>
     
             <message>
              'Import Ldif Tasks: Binary Attribute: Search for certain entries that were imported'

--
Gitblit v1.10.0