From 8ee4c5394fec387d7894f676320a3df7cfce4686 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 13 Dec 2013 13:45:37 +0000
Subject: [PATCH] OPENDJ-1222 Global update of CDDL copyright headers

---
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfg.java                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml                                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/modrdn_entry1.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_add.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/snmp_start.ldif                                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targattrfilter_aci1.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci1.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_proxy_auth_dm.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml                                                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessagesTestCase.java                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1a.ldif                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleTest.java                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail3.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_modifier_entry1.ldif                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleTest.java                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci7.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml                                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml                                                                      |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export.xml                                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/BooleanPropertyDefinitionTest.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml                                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3a.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci6.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_startup.ldif                                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/aci_startup_targetscope.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis2.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21a.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml                                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.1.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/modify.ldif                                                     |   16 
 opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl                                                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci7.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn.xml                                                         |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_selfwrite.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci33.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml                   |   13 
 opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/LDAPResultCode.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml                                                  |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema2.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate_tests.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif                       |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2a.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml                                                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml                                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/ImprovedLDAPConnection.java                                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_groups.ldif                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/SSFTestCase.java                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2a.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci11.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci12.ldif                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFSearchTestCase.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci23.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_search_multiple.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Append.ldif                                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml                                                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-replicaExcludeAdd.ldif                                 |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/target/target.xml                                                                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_auth_tests.xml                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/list.dat                                                       |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci3.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci21.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml                                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif.xml                                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml                                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleTest.java                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TestSynchronousReplayQueue.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control1.ldif                                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1a.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif                                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci3.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore4.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/max_pwd_age/pwp_max_pwd_age.xml                                       |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/del_aci.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_concurrente.ldif                                                     |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema6.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_import/import_task.ldif                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci6.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci8.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry2.ldif                                                     |   13 
 opendj-sdk/opends/tests/functional_manual/setup/setup_replication.html                                                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/SeverityTest.java                                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Include.ref                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci5.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9a.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2a.ldif                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java                                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs                                                                                     |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/aci_startup_add_entry_tests.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail16.ldif                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35a.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Branch.ref                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.1.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/LDAPClientTest.java                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java                        |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_cleanup.xml                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml                                                     |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_modify.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5a.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_day.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml                                                         |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/config.xml                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif                                                    |   16 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/AuthMethodConnectionCriteriaTest.java                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif                                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-write_entry1.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci6.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml                                                      |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31b.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/CSN.java                                                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Include_Attribute.ref                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/preencoded_pwds/pwp_preencoded_pwds.xml                               |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci4.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml                                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_aci.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list_tests.xml                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis_tests.xml                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif                                                   |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_uniquemember.xml                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci1.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapmodify.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_effrights_aci.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.1.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci3.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci5.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif                                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci5.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci4.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Exclude_Attribute.ref                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/ConfigurationTest.java                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci2.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_defaultconf_tests.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get.dat                                                         |   11 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/DITCacheMapTestCase.java                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml                                                      |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml                                                                       |   15 
 opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/DsmlAttrCompare.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/filters/core_tf_filters.xml                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail32.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml                                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml                                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci9.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/baselib.xml                                                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn.xml                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2a.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci10.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci5.ldif                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis11.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_subjectattr.xml                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth.xml                                                         |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci2.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_modify_multiple.xml                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/tfitter.ldif                                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail5.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_checkbehavior.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema.xml                                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn_tests.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/groups.xml                                                                     |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/password_policy.xml                                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis9.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris_tests.xml                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1.ldif                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml                                                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModifyDN.template                                |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema8.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1a.ldif                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_common_prohibited_entry.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/quickstart/quickstart.ldif                                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml                                               |   15 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/basic/replication_operations_basic_tests.xml                       |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema4.ldif                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/MultimasterReplicationFakeConf.java                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml                                                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title34.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetscope/targetscope.xml                                                       |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_checkbehavior.ldif                                                   |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java                                               |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif                                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java                                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java                                 |   13 
 opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/JAXBCheckerException.java                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-0.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema1.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Excludes.ref                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleTest.java                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry_tests.xml                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-add.filters                                                            |   11 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci3.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ANDConnectionCriteriaTest.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci3.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci8.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapmodify.xml                                 |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci31.ldif                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci1.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci12.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci2.ldif                                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleTest.java                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7a.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml                                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml                                                  |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/manual_tests/README_Issue543                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Complex_Filter_Exclude.ref                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis1.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif                                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/moddn.ldif                                                         |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_domain.ldif                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringBuilderTest.java                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci38.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38a.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPGet.java                                                                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci5.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/incompatible_options.xml                                                        |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_common_prohibited_entry.ldif                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci8.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci9.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci2.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml                                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif                                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java                                    |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3.ldif                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-description.ldif                                       |   16 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci32.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci4.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci23.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema_tests.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci11.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciBodyTest.java                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml                                               |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis_tests.xml                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml                                                    |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/tasks/import.ldif                                                                   |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci7.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java                                          |   13 
 opendj-sdk/opends/tests/functional_manual/setup/quicksetup.html                                                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.1.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth.xml                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci5.ldif                                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6a.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci8.ldif                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ValidateConfigDefinitionsTest.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4a.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml                                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml                                             |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci2.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards_tests.xml                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci1.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3.xml                                                                   |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleTest.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc.xml                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis5.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2a.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/_pre.xml                                                                        |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java                                         |   13 
 opendj-sdk/opends/tests/functional_manual/setup/upgrade_cli.html                                                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/shared/ant/usage.xml                                                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout.xml                                               |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/Example.ldif                                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_customconf_tests.xml                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32c.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_jks.xml                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4a.ldif                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleTest.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite.ldif                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci14.ldif                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java                                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging.xml                                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci4.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/shared/xsl/merge_results.xsl                                                                                     |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci21.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr_tests.xml                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AggregationPropertyDefinitionTest.java                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestSubtreeSpecification.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci_wildcard.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-1.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml                                             |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/modifyDn.java                                                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/add.ldif                                                        |   16 
 opendj-sdk/opends/tests/functional_manual/setup/setup_chinesesuffix.html                                                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci5.ldif                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_member.xml                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci1.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci1.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/del_aci.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPSet.java                                                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userdn_aci1.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/security_startup.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_cleanup.xml                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4.ldif                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci2.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci5.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_time.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_int.java                                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci6.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis2.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl                                                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/add.ldif                                                         |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_effrights_aci.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Attribute.ref                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CountryStringSyntaxTest.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml                                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci1.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter.xml                                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/modify.ldif                                                        |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml                                                                    |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci15.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1a.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci37.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search_sep.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32a.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/delete.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic.xml                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/solaris/solaris.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption_tests.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_new_root_user.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci5.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/restore_task.ldif                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_sales_person.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci3.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci8.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp.xml                                                                         |   15 
 opendj-sdk/opends/tests/staf-tests/shared/functions/signals.xml                                                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-2.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Branch_Wrap.ref                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_delete_aci.ldif                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/DSMLService.java                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_start.ldif                                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense18.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.1.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci3.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/last_login/pwp_last_login_tests.xml                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict_tests.xml                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_consistency_tests.xml                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapdelete.xml                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java                         |   13 
 opendj-sdk/opends/tests/functional_manual/setup/quicksetup_replication.html                                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml                                                                 |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic_tests.xml                                               |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/Short_Example.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci9.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci12.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_defaultconf_tests.xml                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci26.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml                                                |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml                                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci2.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci11.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3a.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch_tests.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml                                                        |   13 
 opendj-sdk/opends/tests/functional_manual/console/control_panel.html                                                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/structure/schema_structure.xml                                                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml                                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37a.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1a.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_common_prohibited_entry.ldif                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageTest.java                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2a.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/filters/core_all_filters_noindex.xml                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4a.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_cleanup.xml                                                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry.xml                                                     |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci4.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/min_pwd_age/pwp_min_pwd_age.xml                                       |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic_tests.xml                                               |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore.xml                                                          |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/non_default/pwp_non_default.xml                                       |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml                                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci3.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy_root/add_new_root_user.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense1.ldif                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci10.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry.xml                                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml                                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc_tests.xml                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/shared/topology/basic_topology.txt                                                                               |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml                                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci2.ldif                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/MultiDomainServerStateTest.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3a.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/del_entry.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml                                              |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete.xml                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry.xml                                                           |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr.xml                                                         |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/structure/schema_structure_tests.xml                                           |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AdminTestCase.java                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33a.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties                                                                                      |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml                                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterOnlineImport.template                            |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-master.template                                        |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/nonDefaultBackEnd.ref                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci25.ldif                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci4.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/preencoded_pwds/pwp_preencoded_pwds_tests.xml                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/addmozobj.ldif                                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards.xml                                                   |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml                                               |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes.xml                                                 |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema4.ldif                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4a.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/manager.security                                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml                                          |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31a.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_Include_Exclude_Branch.ref                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/default.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry_tests.xml                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry2.ldif                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_setup.xml                                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci6.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci3.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3a.ldif                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeTypeConstants.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/ldap.xml                                                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/min_pwd_age/pwp_min_pwd_age_tests.xml                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_cleanup.xml                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense2.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci10.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes_tests.xml                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeValue.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_new_root_user.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci35.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci7.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/Example.ldif                                                                    |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci24.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_day.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci3.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/binary_attributes/importldif_binary_attributes_tests.xml                       |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockRequestFilteringQOSPolicyCfg.java                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/Checker.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2a.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml                                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleTest.java                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_cleanup.xml                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Exclude.ldif                                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31a.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml                                                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_setup.xml                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java                    |   13 
 opendj-sdk/opends/tests/staf-tests/shared/python/security.py                                                                                        |   11 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/DNSTestCase.java                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_old_member_static2.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/manual_tests/README_issue588                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/LDAPProfileTest.java                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_IncludeBranch_IncludeAttribute.ref                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml                                                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control2.ldif                                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci4.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/sdk.xml                                                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter_tests.xml                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapcompare.xml                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_aci1.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci2.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci10.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.ldif                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci13.ldif                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci4.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci22.ldif                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6a.ldif                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleTest.java                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_subjectdn.xml                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/staxcmd.xml                                                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/del_aci.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_del_add_del_multiple.xml                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/AD10.ldif                                                                       |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_aci.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/target/target_tests.xml                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci11.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci2.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci32.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/build                                                                                                            |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci28.ldif                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/TestTaskListener.java                                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1a.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci7.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci3.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/SizeUnitTest.java                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci11.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml                                                     |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml                                                                       |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.2.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci6.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_setup.xml                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3a.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_Fractional_Filtered.ref                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency_tests.xml     |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationUnitTest.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/addAnEntry.java                                                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleTest.java                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci3.ldif                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java                                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/replace_member_static3.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci9.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml                                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReaderTestCase.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci6.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci21.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci3.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/agent.security                                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml                                                                        |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis10.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java                     |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_search.xml                                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java                                      |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/properties/importldif_properties.xml                                           |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls.xml                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml                                          |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci13.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1a.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite2.ldif                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNTest.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_title2.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml                                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_telephonenumber1.ldif                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReaderTestCase.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout_duration_tests.xml                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml                                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/ValidatorTests.java                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci1.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_xml.java                                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_policy.xml                                       |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/IPConnectionCriteriaTest.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageBuilderTest.java                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci7.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22a.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis3.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml                                                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/shared/xsl/testspec-stylesheet.xsl                                                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_import_task/import_task.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BLOWFISH.xml                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema3.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_multiple.xml                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/shared/python/schema.py                                                                                          |   11 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/aci_startup.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_version_report.xml                                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore2.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockConstraint.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci3.ldif                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_aci.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci5.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl.xml                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/shared/python/common.py                                                                                          |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris.xml                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_fingerprint.xml                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic.xml                                                             |   15 
 opendj-sdk/opends/tests/functional_manual/setup/windows_service.html                                                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-2.ldif                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBTest.java               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Exclude_Attribute.ref                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_cleanup.xml                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml                                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/properties/importldif_properties_tests.xml                                     |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/UtilsTest.java                                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml                                            |   13 
 opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-logs.xsl                                                                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-remove.filters                                                          |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl.xml                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-modify.filters                                                          |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all_wildcard.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif                                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci3.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml                            |   13 
 opendj-sdk/opends/tests/staf-tests/shared/python/snmp.py                                                                                            |   11 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java                                       |   13 
 opendj-sdk/opends/tests/functional_manual/setup/upgrade_revert_replicated_topology.html                                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-write_aci1.ldif                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/StringPropertyDefinitionTest.java                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_cleanup.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/nonDefault.ldif                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/CategoryTest.java                                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_jks.xml                                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci2.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci1.ldif                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_aci1.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change_tests.xml                       |   15 
 opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java                                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci31.ldif                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/admin_expire_account.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci7.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/AD.ldif                                                                         |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci8.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml                                        |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SASLOverTLSTestCase.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete.xml                                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceReaderTest.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail17.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/importldif/importldif_start.ldif                                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml                                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci1.ldif                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif                               |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn_multiple.xml                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci5.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1a.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-remove.filters                                                         |   11 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci2.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3_defaultconf_tests.xml                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci4.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/quickstart/quickstart.xml                                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml                                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_entry1.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci5.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_user_tests.xml                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci22.ldif                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_time.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/del_aci.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci4.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_equaldn.xml                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci11.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_telephonenumber2.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_tests.xml                                                         |   15 
 opendj-sdk/opends/tests/functional_manual/setup/snmp.html                                                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/search.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1a.ldif                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7a.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-0.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_lib.xml                                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/allow_user_password_changes/pwp_allow_user_password_changes.xml       |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci2.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6a.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39a.ldif                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/shared/stax.dtd                                                                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue1269                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_common_prohibited_attr.ldif                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/del_entry1.ldif                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci22.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml                                                  |   15 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/EclReadAndPlay.java                                                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci9.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml                                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8a.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense3.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/ServerControllerTest.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci6.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif                                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java                                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/ArgsTestCase.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/groups.ldif                                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16a.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci9.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail4.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1WriterTestCase.java                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml                                                           |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter.xml                                                     |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml                                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema7.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/saslSearchClient.java                                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci1.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta.xml                                                                           |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci6.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis1.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml                                                             |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci18.ldif                                               |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci7.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/nonDefault.ldif                                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_common_prohibited_attr.ldif                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis.xml                                                         |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml                                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_aci.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry3.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore3.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis3.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java       |   11 
 opendj-sdk/opends/tests/staf-tests/shared/xsl/junit-report.xsl                                                                                      |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core.xml                                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/add.ldif                                                        |   16 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgClient.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/ResponseChecker.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java                                               |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearch.java                                                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/moddn.ldif                                                      |   16 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights.xml                                             |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_aci.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-3.ldif                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis2.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34a.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-0.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_aci2.ldif                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci1.ldif                                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis4.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_one_user.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/HostPortTest.java                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17a.ldif                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModifyDN.ldif                                    |   16 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci15.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup.xml                                                            |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_multi_acis.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java                                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-1.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3a.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterAdd.ldif                                         |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci5.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.1.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif                                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter.xml                                                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_faxnumber2.ldif                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/AggregationClientTest.java                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/last_login/pwp_last_login.xml                                         |   15 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Change.java                                                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleTest.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapdelete.xml                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis9.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPTrapListener.java                                                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringTest.java                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci33.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/allow_user_password_changes/pwp_allow_user_password_changes_tests.xml |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldappasswdmodify.xml                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/import/import_tests.xml                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Includes.ref                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci4.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci5.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3a.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/basic/importldif_basic.xml                                                     |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/PackageInfoTestCase.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_add_aci.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/TestFileList.java                                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport_tests.xml                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci13.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_modifyrdn_multiple.xml                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail33.ldif                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java                                 |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_6m.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/jks_startup.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Include_Branch.ref                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.2.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5a.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci1.ldif                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml                                   |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete_multiple.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci11.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci14.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml                                          |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci3.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5a.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci6.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_day.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36a.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml                                                                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes_tests.xml                                           |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover_tests.xml                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Exclude_Branch.ref                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema3.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/modifyAnAttribute.java                                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis.xml                                                       |   15 
 opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml                                                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml                                                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify.xml                                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry1.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci2.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci1.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci1.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_setup.xml                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgClient.java                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2a.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/moddn.ldif                                                       |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_member_static1.ldif                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci13.ldif                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3a.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic.xml                                                               |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/TestSubCommand.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_entry_with_new_objclass.ldif                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci8.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change.xml                             |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleTest.java                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights_tests.xml                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth_tests.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_startup.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_delete_aci.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml                                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci16.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml                                                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis12.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/global_acis.ldif                                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Append.ref                                               |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/import_ldif/import_ldif_start.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/replication_operations.xml                                         |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic_tests.xml                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml                                                                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci34.ldif                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReaderTestCase.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci1.ldif                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.java                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1a.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3a.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Server.java                                                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml                                                     |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci8.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/stafcmd.xml                                                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema5.ldif                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/webcontainer.xml                                                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication-safe-data/replication-safe-data.xml                                       |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml                                                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci10.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title35.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml                                                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml                                                           |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_unindexed_searches/50Entries.ldif                             |   13 
 opendj-sdk/opends/tests/staf-tests/shared/staf/staf-slave.cfg                                                                                       |   11 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/operations.xml                                                                 |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-2.ldif                                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildConfiguration.xml                                             |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/ArrayData.java                                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_effrights_aci.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_setup.xml                                                                     |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy_tests.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/SizePropertyDefinitionTest.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif                           |   13 
 opendj-sdk/opends/tests/staf-tests/shared/ant/dependencies.xml                                                                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/defaultBackEnd.ref                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis2.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci10.ldif                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci10.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_acis.xml                                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_description_static4.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_domain.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2a.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal.xml                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/WordEqualityMatchingRuleTest.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetscope/targetscope_tests.xml                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/entry_acis.ldif                                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci26.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges.xml                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif                                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java                                     |   13 
 opendj-sdk/opends/tests/functional_manual/setup/setup_gui_ssl.html                                                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wildcard_domain.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/moddn.ldif                                                      |   16 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4a.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/importldif.xml                                                                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml                                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31c.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/xmlToHtml/xmlToHtml.java                                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_postamble.xml                                                     |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6.ldif                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java                             |   13 
 opendj-sdk/opends/tests/functional_manual/setup/setup_europeansuffix.html                                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr_tests.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml                                                                       |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring.xml                                                             |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci1.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_startTLS.xml                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.ldif                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleTest.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci4.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6a.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestTopCfgDefnTest.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/replace_l.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/import/import.xml                                                                 |   15 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/binary_attributes/importldif_binary_attributes.xml                             |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_customconf_tests.xml                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci10.ldif                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-replicaIncludeAdd.ldif                                 |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci2.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci4.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci1.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci5.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci4.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_time.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/LDIF.java                                                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/clu_start.ldif                                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci7.ldif                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci.ldif                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get2.dat                                                        |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModify.ldif                                      |   16 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci13.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/EmbeddedUtilsTestCase.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/pwp_startup.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceTest.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/ldif_mod.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci3.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/modify.ldif                                                      |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.3.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml                                          |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml                                                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci1.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol_tests.xml                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_effrights_aci.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml                                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml                                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify.ref                                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml                                                      |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.ldif                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/shared/python/objects.py                                                                                         |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci1.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_activation.xml                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter_tests.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci2.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/shared/xsl/testspec-index-stylesheet.xsl                                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/add.ldif                                                           |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml                                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif                                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PluginConfigManagerTestCase.java                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml                                                      |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerSyntaxTest.java                                                |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci2.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry.xml                                                     |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_auth_dm.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/max_pwd_age/pwp_max_pwd_age_tests.xml                                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense1.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci9.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci2.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks.xml                                                     |   15 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete_search.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/shared/ant/staf.xml                                                                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1a.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.1.ldif                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/SecurityConnectionCriteriaTest.java                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security.xml                                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci4.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_authorization_id.xml                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11a.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci7.ldif                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/shared/xsl/id.xsl                                                                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import.xml                                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci27.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/default.ldif                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci1.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchNoServerTestCase.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.4.ldif                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml                                                 |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_aci.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10a.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml                                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/basic/importldif_basic_tests.xml                                               |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapcompare.xml                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci2.ldif                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyTest.java                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/QuickSetupTestCase.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml                                             |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/README                                                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestTextWriter.java                                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema2.ldif                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml                                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriterTestCase.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Writer.java                                                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci2.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TLSByteChannelTestCase.java                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry_tests.xml                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_dynamic_groups.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_customconf_tests.xml                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci6.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry_preencoded_pwd.ldif                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci4.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/non_default/pwp_non_default_tests.xml                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins.xml                                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml                                      |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/basic/replication_operations_basic.xml                             |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes.xml                                                           |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-modify.filters                                                         |   11 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/aci_startup_modify_tests.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci_tests.xml                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci7.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci22.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_aci.ldif                                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci12.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml                                                |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication.xml                                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ReaderTestCase.java                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout_failure_count_tests.xml                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_search.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif                                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/shared/staf/staf-controller.cfg                                                                                  |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml                                             |   13 
 opendj-sdk/opends/tests/staf-tests/build.bat                                                                                                        |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Schema.ldif                                                                |   16 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilterTest.java                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3a.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci3.ldif                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci9.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci17.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/solaris/rfc4876.ldif                                                         |   15 
 opendj-sdk/opends/tests/staf-tests/shared/ant/opends.xml                                                                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_add_aci.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication.xml                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_virtual_static.xml                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/BindDNConnectionCriteriaTest.java                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci7.ldif                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleTest.java                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci2.ldif                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci21.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci39.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6.ldif                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1b.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_dynamic.xml                                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci12.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci8.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci22.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Include.ldif                                                               |   16 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2a.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml                                                               |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/general_options.xml                                                             |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/TestSubCommandArgumentParser.java                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/grace_login/pwp_grace_login.xml                                       |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci12.ldif                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldappasswdmodify.xml                                     |   13 
 opendj-sdk/opends/tests/staf-tests/shared/python/replication.py                                                                                     |   11 
 opendj-sdk/opends/tests/staf-tests/shared/topology/3server_topology.txt                                                                             |   11 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.1.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml                                                  |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change_all_users_tests.xml             |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapsearch.xml                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci1.ldif                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoTestCase.java                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci6.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Exclude_Branch.ref                                       |   13 
 opendj-sdk/opends/tests/staf-tests/shared/ant/user.xml                                                                                              |   13 
 opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml                                                                                    |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/modify.ldif                                                     |   16 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci21.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/grace_login/pwp_grace_login_tests.xml                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-1.ldif                                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4a.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol.xml                                                   |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java                                            |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/IntegerPropertyDefinitionTest.java                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif                                         |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Reader.java                                                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci3.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4a.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.1.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif                                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1.ldif                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml                                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci2.ldif                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3_customconf_tests.xml                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml                                                                 |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1.ldif                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clu_secure.xml                                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci7.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/05-DynamicSchemaAdd.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci36.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml                                   |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockResourceLimitsQOSPolicyCfg.java                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapsearch.xml                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci8.ldif                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml                                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication-safe-read/replication-safe-read.xml                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis8.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci3.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif                            |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks_tests.xml                                               |   15 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DNPropertyDefinitionTest.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/backend_start.ldif                                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml                                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockClientConnection.java                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci34.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1a.ldif                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter_tests.xml                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci2.ldif                                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml                                                  |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml                                            |   13 
 opendj-sdk/opends/tests/functional_manual/setup/setup_cli.html                                                                                      |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication.xml                                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1a.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml                                               |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue462                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue464                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue465                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2a.ldif                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/search.filters                                                                |   11 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/IPTestCase.java                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-add.filters                                                             |   11 
 opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/quickstart/quickstart.ldif                                                              |   13 
 opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl                                                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr_tests.xml                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAccountStatusNotificationHandler.java                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/LevenshteinDistanceTestCase.java                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2a.ldif                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_defaultconf_tests.xml                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis8.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9.ldif                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci25.ldif                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci24.ldif                                                       |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_moddn.ldif                                                           |   16 
 opendj-sdk/opends/tests/installer.xml                                                                                                               |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif                                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java                                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif                                                 |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/_post.xml                                                                       |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml                                              |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/EnumRightTest.java                                  |   13 
 opendj-sdk/opends/tests/staf-tests/shared/dsml/resource/errorStrings.properties                                                                     |   11 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/PropertiesFilesTest.java                                                   |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci4.ldif                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java                             |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif                                    |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry1.ldif                                                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif                                                         |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java                         |   13 
 opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/ParseData.java                                                                           |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java                                            |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif                                           |   13 
 opendj-sdk/opends/tests/staf-tests/shared/ant/proxy.xml                                                                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_aci.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci6.ldif                                              |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif                                                  |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml                     |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks_tests.xml                                          |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency.xml           |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite2.ldif                                        |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema5.ldif                                                     |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif                                  |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n.xml                                                                         |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml                                         |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml                                                                           |   15 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title18.ldif                                             |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfg.java                                                      |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci14.ldif                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java                                               |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java                                                |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail31.ldif                                          |   13 
 opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml                                                   |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java                                       |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java                                                |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java                                        |   13 
 opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java                                                       |   13 
 1,888 files changed, 11,515 insertions(+), 13,322 deletions(-)

diff --git a/opendj-sdk/opends/tests/functional_manual/console/control_panel.html b/opendj-sdk/opends/tests/functional_manual/console/control_panel.html
index 885a2be..3e50fb4 100644
--- a/opendj-sdk/opends/tests/functional_manual/console/control_panel.html
+++ b/opendj-sdk/opends/tests/functional_manual/console/control_panel.html
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/quicksetup.html b/opendj-sdk/opends/tests/functional_manual/setup/quicksetup.html
index c862472..904eda9 100755
--- a/opendj-sdk/opends/tests/functional_manual/setup/quicksetup.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/quicksetup.html
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/quicksetup_replication.html b/opendj-sdk/opends/tests/functional_manual/setup/quicksetup_replication.html
index 3660acc..7c7719d 100755
--- a/opendj-sdk/opends/tests/functional_manual/setup/quicksetup_replication.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/quicksetup_replication.html
@@ -7,17 +7,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/setup_chinesesuffix.html b/opendj-sdk/opends/tests/functional_manual/setup/setup_chinesesuffix.html
index 81bc128..159ddc7 100755
--- a/opendj-sdk/opends/tests/functional_manual/setup/setup_chinesesuffix.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/setup_chinesesuffix.html
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/setup_cli.html b/opendj-sdk/opends/tests/functional_manual/setup/setup_cli.html
index 69a7e6f..80fadd0 100755
--- a/opendj-sdk/opends/tests/functional_manual/setup/setup_cli.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/setup_cli.html
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/setup_europeansuffix.html b/opendj-sdk/opends/tests/functional_manual/setup/setup_europeansuffix.html
index 573f1ec..59b4824 100755
--- a/opendj-sdk/opends/tests/functional_manual/setup/setup_europeansuffix.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/setup_europeansuffix.html
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/setup_gui_ssl.html b/opendj-sdk/opends/tests/functional_manual/setup/setup_gui_ssl.html
index b74f9b0..2440efd 100644
--- a/opendj-sdk/opends/tests/functional_manual/setup/setup_gui_ssl.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/setup_gui_ssl.html
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/setup_replication.html b/opendj-sdk/opends/tests/functional_manual/setup/setup_replication.html
index ff5ae83..084b8bf 100755
--- a/opendj-sdk/opends/tests/functional_manual/setup/setup_replication.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/setup_replication.html
@@ -7,17 +7,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/snmp.html b/opendj-sdk/opends/tests/functional_manual/setup/snmp.html
index 4ce8bec..02eda3e 100755
--- a/opendj-sdk/opends/tests/functional_manual/setup/snmp.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/snmp.html
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/upgrade_cli.html b/opendj-sdk/opends/tests/functional_manual/setup/upgrade_cli.html
index 9e3f116..74a9bd5 100755
--- a/opendj-sdk/opends/tests/functional_manual/setup/upgrade_cli.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/upgrade_cli.html
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/upgrade_revert_replicated_topology.html b/opendj-sdk/opends/tests/functional_manual/setup/upgrade_revert_replicated_topology.html
index fe0592f..a60ac33 100644
--- a/opendj-sdk/opends/tests/functional_manual/setup/upgrade_revert_replicated_topology.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/upgrade_revert_replicated_topology.html
@@ -7,17 +7,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/functional_manual/setup/windows_service.html b/opendj-sdk/opends/tests/functional_manual/setup/windows_service.html
index a0302ec..c156d50 100644
--- a/opendj-sdk/opends/tests/functional_manual/setup/windows_service.html
+++ b/opendj-sdk/opends/tests/functional_manual/setup/windows_service.html
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/installer.xml b/opendj-sdk/opends/tests/installer.xml
index 8e88e03..03435e7 100644
--- a/opendj-sdk/opends/tests/installer.xml
+++ b/opendj-sdk/opends/tests/installer.xml
@@ -6,17 +6,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/build b/opendj-sdk/opends/tests/staf-tests/build
index ead23cc..c8c431a 100755
--- a/opendj-sdk/opends/tests/staf-tests/build
+++ b/opendj-sdk/opends/tests/staf-tests/build
@@ -7,16 +7,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/build.bat b/opendj-sdk/opends/tests/staf-tests/build.bat
index 9fa3e4a..10b862d 100644
--- a/opendj-sdk/opends/tests/staf-tests/build.bat
+++ b/opendj-sdk/opends/tests/staf-tests/build.bat
@@ -7,16 +7,15 @@
 rem (the "License").  You may not use this file except in compliance
 rem with the License.
 rem
-rem You can obtain a copy of the license at
-rem trunk/opends/resource/legal-notices/OpenDS.LICENSE
-rem or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+rem You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+rem or http://forgerock.org/license/CDDLv1.0.html.
 rem See the License for the specific language governing permissions
 rem and limitations under the License.
 rem
 rem When distributing Covered Code, include this CDDL HEADER in each
-rem file and include the License file at
-rem trunk/opends/resource/legal-notices/OpenDS.LICENSE.  If applicable,
-rem add the following below this CDDL HEADER, with the fields enclosed
+rem file and include the License file at legal-notices/CDDLv1_0.txt.
+rem If applicable, add the following below this CDDL HEADER, with the
+rem fields enclosed by brackets "[]" replaced with your own identifying
 rem information:
 rem      Portions Copyright [yyyy] [name of copyright owner]
 rem
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/aci_startup_add_entry_tests.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/aci_startup_add_entry_tests.ldif
index 371df47..4c7914f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/aci_startup_add_entry_tests.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/aci_startup_add_entry_tests.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci1.ldif
index d041b1f..88e367b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci2.ldif
index 3a35357..19efa41 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci3.ldif
index f9be34e..8c9e5eb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1.ldif
index 6ecd1e8..20e779d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1a.ldif
index e191664..d2cc745 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2.ldif
index 66c1bbb..c3762f1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2a.ldif
index 0e0dd08..8ed777d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3.ldif
index cd9cdd8..e3d23b0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3a.ldif
index ac5fa35..a522827 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-add_entry3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_aci1.ldif
index f79738a..a956ef5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_entry1.ldif
index 4aa3c06..fb05034 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_allow-delete_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_common_prohibited_entry.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_common_prohibited_entry.ldif
index d5d27a1..a088d60 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_common_prohibited_entry.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_common_prohibited_entry.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1.ldif
index 40c698f..988e05d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1a.ldif
index d983c9b..b2dad03 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2.ldif
index 3d32f93..0666252 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2a.ldif
index aa924cd..100cc3a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3.ldif
index 71b2669..1bf05f9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3a.ldif
index 5751a26..6d49e3a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4.ldif
index 3009b10..2b1db9e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4a.ldif
index 281b620..00953e2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry4a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5.ldif
index d680eba..8c7b8fb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5a.ldif
index 6186de4..456bcb2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_aci_entry5a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis1.ldif
index 4d11af6..4d74254 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis2.ldif
index 37522d1..cf0381c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis3.ldif
index f0e7786..07651ba 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis4.ldif
index 4de2f13..f0c8cd9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis5.ldif
index 011a522..c4574ce 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_multi_acis5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci1.ldif
index b294106..907e977 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci2.ldif
index d321867..b4d025e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci3.ldif
index c8edc97..3b773f1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1.ldif
index 31ad791..323e19c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1a.ldif
index d4d64e8..80d683d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2.ldif
index 52849fc..9c5a8a7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2a.ldif
index b2f5a4c..7c93a3e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3.ldif
index 345f80d..e982f92 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3a.ldif
index fbf5f97..ac10c34 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targattrfilter_entry3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_aci1.ldif
index 572f221..7e4e2f1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1.ldif
index cd909ba..a924f7a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1a.ldif
index 50c278a..775a43d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetattr_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci1.ldif
index 70e418e..800c71f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci2.ldif
index f529f56..cfb3395 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1.ldif
index 69bd4684..112a96b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1a.ldif
index e752b4c..87121ae 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2.ldif
index 8320fbb..7d4818f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2a.ldif
index f217f6a..df370e6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/add_targetfilter_entry2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_aci.ldif
index 53b8289..d0875cb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis.ldif
index e08c7c4..069180b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis2.ldif
index 1f9ca4a..efec606 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_add_entry/del_multi_acis2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif
index 1df7b68..5179b5d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_dynamic_groups.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_dynamic_groups.ldif
index 462b4ee..fb999cc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_dynamic_groups.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_dynamic_groups.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci1.ldif
index 956709f..9826be7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci10.ldif
index 0cdd4c9..9f70f47 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci2.ldif
index 953d46a..bb9c7dd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci3.ldif
index a85c9f2..15f3003 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci4.ldif
index 8037031..7746ddb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci5.ldif
index dca2189..e5ccf1e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci6.ldif
index 4094620..a1fffbd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci7.ldif
index 6319ac0..5db395a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci8.ldif
index 50c3d3a..2cf19fa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci9.ldif
index f1cff7e..abc511f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_aci9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_selfwrite.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_selfwrite.ldif
index 9203c9f..68a630b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_selfwrite.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_groupdn_selfwrite.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_description_static4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_description_static4.ldif
index 886ad30..60d64e1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_description_static4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_description_static4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_member_static1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_member_static1.ldif
index ffa2bcf..ba87e32 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_member_static1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_new_member_static1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_groups.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_groups.ldif
index ece47be..d5be53f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_groups.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_groups.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite.ldif
index e08066e..ba12fd6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite2.ldif
index 1565ecf..4432b75 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_static_selfwrite2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci1.ldif
index cb028e8..2b8c451 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci2.ldif
index 86cdd40..40c06c8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci3.ldif
index eb24114..e4a4c74 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci4.ldif
index 336a408..687e282 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci5.ldif
index cc32c09..0874a88 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci6.ldif
index b8bd35f..452f0e8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_syntax_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci1.ldif
index cb4416c..288ac52 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci2.ldif
index 676e93f..fbb44ce 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci3.ldif
index 8454274..3195050 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci4.ldif
index 49eb779..c7e2fed 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci5.ldif
index 2593857..6a708d8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci6.ldif
index 5ea28a1..3a1af0d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci7.ldif
index 6c0d5d1..3829f44 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci8.ldif
index 09e01fd..29268eb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userattr_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userdn_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userdn_aci1.ldif
index 56de05d..fcde178 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userdn_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/add_userdn_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_aci.ldif
index 75fbf73..5fcb251 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_old_member_static2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_old_member_static2.ldif
index 5da6eb0..f72be55 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_old_member_static2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_old_member_static2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite.ldif
index 0b7bf44..3d1f3fb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite2.ldif
index de7b06a..a493807 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/del_static_selfwrite2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/replace_member_static3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/replace_member_static3.ldif
index 0941adf..2bd18d8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/replace_member_static3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_bindtypes/replace_member_static3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci1.ldif
index b67e06c..ece9321 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.1.ldif
index abf70a2..99ca5b9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.2.ldif
index 75ee152..9952987 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.3.ldif
index 7d4129a..dec9d46 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.4.ldif
index 12b3b56..01c4324 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.ldif
index 3c16203..cd2323e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci3.ldif
index 698d9d6..fcf1a2d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci4.ldif
index d4cecf3..b3071ba 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci5.ldif
index bb151c2..5cb00cb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci6.ldif
index 45118cb..9019683 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci7.ldif
index cfc965e..92e31af 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis8.ldif
index 255dfcc..e9d27ba 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis9.ldif
index fcfa2e0..6b7cb97 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/add_multi_acis9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_aci.ldif
index 7bd4324..57cb9f2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_multi_acis.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_multi_acis.ldif
index 214f38a..a459c39 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_multi_acis.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_compare_tests/del_multi_acis.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif
index 4ab15451..6318020 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci2.ldif
index 8ad89a6..ce80baf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci3.ldif
index 750fa61..ca06c93 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci1.ldif
index ecb08f8..ddec5b8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci2.ldif
index 15a59dc..e50a089 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci3.ldif
index d5f536f..d7b2292 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci4.ldif
index 155da6a..4e45db3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-delete_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-write_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-write_aci1.ldif
index b4dd476..3677cbc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-write_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_allow-write_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis1.ldif
index 7a3854f..efa9fc6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis2.ldif
index afa43b5..42f5a9a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis3.ldif
index c134318..a15b7b6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif
index 301855c..089d87c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif
index 6c57937..74f4396 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_multi_acis5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targattrfilter_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targattrfilter_aci1.ldif
index 09c6263..14bd652 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targattrfilter_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targattrfilter_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci1.ldif
index 7a2746c..e0bde7f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci2.ldif
index 3e497d3..db45be8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetattr_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci1.ldif
index 6e25980..440dfcd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci2.ldif
index 886cb2a..3729d4d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci3.ldif
index 36473fd..1691cda 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci4.ldif
index f715190..17c9a26 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci5.ldif
index a9d7a11..2fed6b2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/add_targetfilter_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_aci.ldif
index 16223fe..c3d06ad 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1.ldif
index 43cdc71..a9671a7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1a.ldif
index 84daa40..d39449d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2.ldif
index 7e8ddca..b9ccfae 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2a.ldif
index e59fc7f..f2a98cc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif
index 002af58..0bc7f37 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.ldif
index ccbf1e5..e339dce 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3a.ldif
index dad37d7..bd8dd71 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-delete_entry3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-write_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-write_entry1.ldif
index 002af58..0bc7f37 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-write_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_allow-write_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense1.ldif
index 1246ac7..54fe4ee 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense2.ldif
index 8555db3..3f75742 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense3.ldif
index 90159a8..de0588a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_carlicense3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_common_prohibited_entry.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_common_prohibited_entry.ldif
index 002af58..0bc7f37 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_common_prohibited_entry.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_common_prohibited_entry.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1.ldif
index b48c9c1..0e15bd4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1a.ldif
index 70d6b11..e799589 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2.ldif
index b48c9c1..0e15bd4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2a.ldif
index 70d6b11..e799589 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3.ldif
index 8c7e7ec..636b312 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3a.ldif
index abc16e2..5c40cc9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif
index 12d549d..eeb39e1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif
index 992fe01..01f5d4f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry4a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif
index 9b683a2..e777a4d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif
index 2201ff0..b735deb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_aci_entry5a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis.ldif
index 9cda28b..c59a979 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif
index 084d826..e5019dc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_multi_acis2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1.ldif
index 310fe4a..750ed0c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif
index 4a2f2b7..18c56e2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targattrfilter_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1.ldif
index ee74fa5..8e4d0a5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1a.ldif
index 5d94457..6a2a12c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2.ldif
index 94b15c0..6effba8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2a.ldif
index 18d8c4e..4a8de77 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetattr_entry2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1.ldif
index deec3c0..0906212 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1a.ldif
index f308ad1..f76a318 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2.ldif
index 002af58..0bc7f37 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2a.ldif
index 019a00b..b622175 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3.ldif
index e3c7396..a97693c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3a.ldif
index 5ee7f73..820b2f0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4.ldif
index b88bb36..4dcafd4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4a.ldif
index 4a5914a..7f92b65 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry4a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5.ldif
index 23cebdd..466aa16 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5a.ldif
index 6f1d77f..fba2992 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_targetfilter_entry5a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1.ldif
index ce3819e..7ec4bd9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1a.ldif
index b00f026..6855336 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2.ldif
index 544c4df..533edc1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2a.ldif
index 2320065..17fec22 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3.ldif
index 58f4d13..9f2b723 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3a.ldif
index 97cf65f..7880ce4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_delete_entry/del_title3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci1.ldif
index 9043379..33f5439 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci10.ldif
index 5926d61..6a4686f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci11.ldif
index d8c9236..ecb45c5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci12.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci12.ldif
index 4f7a9d3..2a96a5a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci12.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci12.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci13.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci13.ldif
index f47f029..e299f0c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci13.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci13.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci2.ldif
index 2def278..afddbba 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci21.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci21.ldif
index 3924390..43d8bae 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci21.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci21.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci22.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci22.ldif
index 84f02e2..97eac2f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci22.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci22.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci3.ldif
index eb807dc..df7f75a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci4.ldif
index 27714fd..2412943 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci5.ldif
index 7b696be..5572f71 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci6.ldif
index 180a507..3d718fa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci7.ldif
index 0eccac5..6ee2912 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci8.ldif
index 66e1b4d..207cb84 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci9.ldif
index f62d1d4..1ec9d97 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_aci9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_effrights_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_effrights_aci.ldif
index 8ded8aa..91e5c71 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_effrights_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/add_effrights_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_aci.ldif
index 7bd4324..57cb9f2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_effrights_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_effrights_aci.ldif
index 8c8a2e2..bb0756d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_effrights_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_effective_rights/del_effrights_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_import/import_task.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_import/import_task.ldif
index e0a8123..eaf2e12 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_import/import_task.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_import/import_task.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/aci_startup_modify_tests.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/aci_startup_modify_tests.ldif
index 8ce192e..fa24d82 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/aci_startup_modify_tests.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/aci_startup_modify_tests.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci1.ldif
index 805e0f4..8b23389 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci2.ldif
index 271bfe9..e721f08 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci3.ldif
index a731eaa..2dee1be 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci4.ldif
index 9b85095..109dce3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci5.ldif
index 5c8ea2d..ac2cc5b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci6.ldif
index 3bad1b4..c03827c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci7.ldif
index 83c3289..27ca752 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_add_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_common_prohibited_attr.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_common_prohibited_attr.ldif
index 4c60727..bc8f3ae 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_common_prohibited_attr.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_common_prohibited_attr.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci1.ldif
index 3666daf..3c31b52 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci2.ldif
index 99cb723..7e18faa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci3.ldif
index 15d2efc..1f4e80e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci4.ldif
index 49667ac..4f49924 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci5.ldif
index 908a989..8694c17 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci6.ldif
index 6344a84..7a471f2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci7.ldif
index d5590b7..9d7d2d1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_delete_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci1.ldif
index 06280f1..f3885f5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci2.ldif
index d927ee2..48aec5b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci3.ldif
index f0d114f..e45358d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci4.ldif
index 2cd5f80..86d7777 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci5.ldif
index 0afd90b..4d4574c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci6.ldif
index 9599c74..9beac8e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci7.ldif
index 4f9f765..c20c905 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis10.ldif
index ff86919..9ceb5be 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis11.ldif
index 50ca0f1..217b9c9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis12.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis12.ldif
index f96f877..65acc94 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis12.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis12.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis8.ldif
index 5e849f5..32272ef 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis9.ldif
index c0d6fb1..5360d13 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/add_modify_multi_acis9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_aci.ldif
index d048167..70e5e4d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_common_prohibited_attr.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_common_prohibited_attr.ldif
index e8dd33f..a170ce8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_common_prohibited_attr.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_common_prohibited_attr.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis.ldif
index c7be87e..6a01f9e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis2.ldif
index 2047090..2d2eeff 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/del_multi_acis2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.1.ldif
index 5f4133e..e7f969a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.ldif
index fdf0507..9e685d0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4a.ldif
index e5bd6d4..f781c5d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_add4a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif
index 911687d..1a0da0f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.ldif
index 8ec15e8..54b3465 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4a.ldif
index e4c0303..05cfc3d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_delete4a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif
index 5992760..c8733e3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.ldif
index 06d2c64..fcf164b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4a.ldif
index 1a3fcca..c195774 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-read_entry4a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1.ldif
index 00af333..b6c3cf7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1a.ldif
index a0ba647..a5694f7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.1.ldif
index 360608d..bc1cf5a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.ldif
index d69240d..b87cd32 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2a.ldif
index e2986ec..8a0c85b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.1.ldif
index 565fdcd..c04247e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.2.ldif
index 7573528..e09c33d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.ldif
index 72b5ed9..83c9675 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3a.ldif
index db28f16..2ac90da 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_add3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1.ldif
index c4dfba9..779eafd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1a.ldif
index 36c7440..660fb25 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif
index 911687d..1a0da0f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.ldif
index 46b51d6..772c3c7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2a.ldif
index 077f590..7602c8d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif
index 911687d..1a0da0f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.ldif
index 48c4260..3d5fe52 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3a.ldif
index 9dd6ada..99c49d5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_delete3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1.ldif
index 73f0384..1dbce95 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1a.ldif
index c0fc983..9a58206 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif
index 5992760..c8733e3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.ldif
index baad0e0..9631c95 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2a.ldif
index 6ba7ae2..cecd066 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif
index 5992760..c8733e3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.ldif
index 0e6b095..91c115b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3a.ldif
index 83b6432..c801c10 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_allow-write_entry3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_common_prohibited_entry.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_common_prohibited_entry.ldif
index a13e50f..bec4c74 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_common_prohibited_entry.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_common_prohibited_entry.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10.ldif
index ff10a96..90f8303 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif
index 4fd4211..5fd829d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry10a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11.ldif
index 460cb8a..07cbf51 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif
index b9ad397..de5fdee 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry11a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12.ldif
index 928daf2..d7f6423 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif
index 9c7b4dc..4be96f0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry12a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8.ldif
index 2a03ba9..ddea176 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif
index a7dbb48..476ac23 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry8a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9.ldif
index 93b1605..8544123 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif
index 5134a96..d58672b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_multi_acis_entry9a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif
index 5862b09..5821414 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif
index a8bc88f..fd9ffe4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif
index f8a749f..95ef935 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.ldif
index 9332885..9e3e213 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5a.ldif
index e870739..e0d8679 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_add5a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif
index 11143ff..00a9f71 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif
index cc41cca..4fe03f9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif
index 26ffb4b..64eacef 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif
index f5559fe..f214ee9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif
index 62f7e53..3e9745b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_delete5a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif
index b51f716..92b3e56 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif
index 2b49050..2e1bebd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif
index e3e927a..12dfd0b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif
index 6420e9c..c8381f9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif
index fcceb1f..7f947e4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targattrfilter_entry5a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6.ldif
index 6e092b3..67a7b9b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6a.ldif
index e324d63..1964380 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add6a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7.ldif
index 6f467bd..c257516 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7a.ldif
index 9a08745..f3205ff 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_add7a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6.ldif
index 15457ec..2cc201c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif
index 5699c3a..637495e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete6a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7.ldif
index 15457ec..2cc201c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif
index 5699c3a..637495e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_delete7a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif
index eae0da8..6681625 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.ldif
index e105dc5..7acc262 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif
index 9454341..1408945 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry6a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif
index eae0da8..6681625 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.ldif
index 3071780..00a19ef 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif
index c192865..f4ea566 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_entry/mod_targetfilter_entry7a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif
index 3769329..9511b2a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif
index 103ca4d..9e607c3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif
index 462b8cf..7a2a51b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif
index e1f0ae4..55644d7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci12.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif
index 44e3906..1b49fa1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci13.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif
index 247c52d..1a735af 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci14.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif
index 5279689..c7914cf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci15.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif
index da32a7e..6e85c68 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci16.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif
index 1016e81..8dfcfcb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif
index b631780..a00b5e9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci21.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif
index d7fbd45..0c6845e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci22.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif
index 10e21b0..5d620ef 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci23.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif
index 20de31b..c61ded2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci24.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif
index d242d08..de030c0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci25.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif
index 5715c65..ce3bff8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci26.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif
index a9e73b5..b8e03f1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif
index 32afe63..c54af36 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif
index 6a5cbb5..c92bad8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif
index aa651de..55883eb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/add_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif
index d49bf74..d053695 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif
index f5bf92b..1869575 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod0.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif
index 111a1f7..800ac41 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif
index 6b0cd0f..840d57b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif
index 07f5dd9..ccd1639 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif
index 42885ef..6dec87b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif
index 2c2884c..26c7094 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif
index 9751501..bda90fe 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif
index 2f93704..07756a9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif
index a2f4b8a..36216d4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif
index a065d18..12dfe2e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_filter_tests/mod9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif
index e9f8320..e2ec505 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci1.ldif
index df36721..c18f2ce 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci10.ldif
index 01198f6..96f47db 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci11.ldif
index 0034e79..9e89352 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci2.ldif
index d6d02ea..7359744 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci21.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci21.ldif
index 1f2f6e7..85655b2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci21.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci21.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci22.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci22.ldif
index 95dd577..2affc4c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci22.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci22.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci3.ldif
index 5c938ef..478376f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci4.ldif
index a805f51..a94edb7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci5.ldif
index 1c6d05e..9541144 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci6.ldif
index 17eecc8..375ea1e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci7.ldif
index 0fc69e4..c4c636d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci8.ldif
index 04c385b..cf15f36 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci9.ldif
index 5a0375e..df028e4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/add_modrdn_aci9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/del_aci.ldif
index b6df2b6..c661b9f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif
index a6fc0f4..8ccc4f3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/mod_common_prohibited_entry.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1.ldif
index e019ce4..ff15d78 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10.ldif
index d5b1f3b..37515f0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10a.ldif
index 1bd21a7..537ddfb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry10a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11.ldif
index 9e23942..e1092ad 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11a.ldif
index 05eb1e4..7684025 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry11a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1a.ldif
index 4e72589..d6d8e71 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2.ldif
index c099ea1..a4a58a8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21.ldif
index ac1a3a6..266acc8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21a.ldif
index 688e18f..c80a5e5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry21a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22.ldif
index d26f120..816a288 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22a.ldif
index 688e18f..c80a5e5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry22a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2a.ldif
index 8bd7222..88294a0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3.ldif
index 573345d..4aad8c6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3a.ldif
index 7b778ed..8b67812 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4.ldif
index 7ff3944..c29cf99 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4a.ldif
index 24bd499..e340fbe 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry4a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5.ldif
index 47a353b..7aac18d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5a.ldif
index 8bd7222..88294a0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry5a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6.ldif
index c099ea1..a4a58a8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6a.ldif
index 8bd7222..88294a0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry6a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.1.ldif
index 6389747..b010fb1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.ldif
index 853c1ec..93b70e0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7a.ldif
index ddfce81..9645f1c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry7a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8.ldif
index d26f120..816a288 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8a.ldif
index 59ce5df..cbed050 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry8a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9.ldif
index afb633a..0e6f924 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9a.ldif
index 510aea5..54a852f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_entry9a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore2.ldif
index 9f1d0b0..0ba28e6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore3.ldif
index af066a0..6436785 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore4.ldif
index af066a0..6436785 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/modrdn_restore4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci21.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci21.ldif
index 295958b..9044def 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci21.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci21.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci22.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci22.ldif
index badaa9b..0641348 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci22.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci22.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci8.ldif
index e34eb82..df82dbc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_modify_rdn/replace_modrdn_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci.ldif
index 5f7d577..1b7de89 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci_wildcard.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci_wildcard.ldif
index d078789..7c5e106 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci_wildcard.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_aci_wildcard.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_auth_dm.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_auth_dm.ldif
index 71da2fc..e9a4673 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_auth_dm.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_proxy_auth_dm.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_add.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_add.ldif
index ca926c0..485f245 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_add.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_add.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all.ldif
index f83bdfa..f338117 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all_wildcard.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all_wildcard.ldif
index 23fc081..58ebd9b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all_wildcard.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_all_wildcard.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search.ldif
index 42098d1..b071595 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search_sep.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search_sep.ldif
index efe386d..8f84b80 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search_sep.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/add_user_aci_search_sep.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci.ldif
index 7bd4324..57cb9f2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci2.ldif
index 7815ae5..94a1173 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_proxy_auth_dm.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_proxy_auth_dm.ldif
index 0de8c98..eaad278 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_proxy_auth_dm.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_proxy_auth/del_proxy_auth_dm.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif
index 17512fc..1a648ef 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci1.ldif
index bb1fbfd..8817a44 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci10.ldif
index 31a2124..3c4ac7d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci11.ldif
index dfa5d19..9fcd0ee 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci12.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci12.ldif
index 1b74837..a8eef1d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci12.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci12.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci2.ldif
index af1e2e4..eef0127 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci21.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci21.ldif
index 0f497d5..e6c98b2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci21.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci21.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci22.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci22.ldif
index 419dc2a..5fd8b68 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci22.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci22.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci23.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci23.ldif
index 849b3b0..fd9b497 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci23.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci23.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci24.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci24.ldif
index b56afdb..c3f753e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci24.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci24.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci25.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci25.ldif
index f1483b3..6ba194f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci25.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci25.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci26.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci26.ldif
index f0e926f..89d7ace 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci26.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci26.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci3.ldif
index 02a07cf..8aa4d1e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci4.ldif
index e374c62..96d3029 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci5.ldif
index 0cf3026..d5b3316 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci6.ldif
index 2d482d6..34caf3c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci7.ldif
index f2bd9b0..a3354c9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci8.ldif
index 10fc59b..a2c9c69 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci9.ldif
index d918f4b..5f95ab9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/add_aci9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/del_aci.ldif
index 8d53d18..d8482f4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_rdn_wildcards/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_startup.ldif
index 9cbca9f..18914a5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci1.ldif
index 8b26e45..f90fc59 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci10.ldif
index 707ac46..fa9d91c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci11.ldif
index 7896530..37db197 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci12.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci12.ldif
index a97887c..44d1490 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci12.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci12.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci13.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci13.ldif
index 4736a5e..5a11964 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci13.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci13.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci14.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci14.ldif
index f54a6b6..4bfcecb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci14.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci14.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci15.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci15.ldif
index a5fa26b..b23296d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci15.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci15.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci16.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci16.ldif
index 5e95135..d83e572 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci16.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci16.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci17.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci17.ldif
index 2dade2e..4392f26 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci17.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci17.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci18.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci18.ldif
index a0072ae..ddd1418 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci18.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci18.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
@@ -26,5 +25,5 @@
 dn: ou=aci branch, o=ACI Tests, dc=example,dc=com
 changetype: modify
 replace: aci
-aci: (targetattr="*")(targattrfilters="add=title:(title=Eng*)")(version 3.0; acl "add_aci18 The contents of this file are subject to the terms of the Common Development and Distribution License, Version 1.0 only. 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. See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each ile 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]"; allow (all) userdn="ldap:///all";)
+aci: (targetattr="*")(targattrfilters="add=title:(title=Eng*)")(version 3.0; acl "add_aci18 The contents of this file are subject to the terms of the Common Development and Distribution License, Version 1.0 only. You may not use this file except in compliance with the License. You can obtain a copy of the license at legal-notices/CDDLv1_0.txt or http://forgerock.org/license/CDDLv1.0.html. 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 legal-notices/CDDLv1_0.txt. 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]"; allow (all) userdn="ldap:///all";)
 
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci2.ldif
index 04b53a0..176182b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci3.ldif
index e219b20..a7e0dad 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci4.ldif
index f829581..7d5128f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci5.ldif
index dba7a33..e52b8c4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci6.ldif
index 09b634d..8b68b0e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci7.ldif
index 4b832c3..5b9d4b5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci8.ldif
index 73b59df..5b24e62 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci9.ldif
index a15eb64..ad2b8b0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_aci9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense1.ldif
index 9f62550..0850e08 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense18.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense18.ldif
index 9f62550..0850e08 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense18.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_carlicense18.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_telephonenumber2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_telephonenumber2.ldif
index 280706c..9d85c40 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_telephonenumber2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_telephonenumber2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1.ldif
index c135f3f..6eb40d2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title18.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title18.ldif
index 5913f2a..0c30920 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title18.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title18.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1a.ldif
index d82c33a..fb04bc7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1b.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1b.ldif
index 6ea5320..3335cdf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1b.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/add_title1b.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_aci.ldif
index 7bd4324..57cb9f2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_faxnumber2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_faxnumber2.ldif
index 3a6dd61..ba227ff 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_faxnumber2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_faxnumber2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2.ldif
index 6f680a0..f3d5e42 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2a.ldif
index cb5c997..bb615f9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_roomnumber2a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_telephonenumber1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_telephonenumber1.ldif
index f815a2f..c780523 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_telephonenumber1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_telephonenumber1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_title2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_title2.ldif
index bffa81e..33432e4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_title2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/del_title2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16.ldif
index 360af83..f1602f8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16a.ldif
index 6ec1d43..aeceffb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l16a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3.ldif
index b556c48..8909a17 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3a.ldif
index c064fac..1c539ce 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5.ldif
index 2621103..51c6f70 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5a.ldif
index c2cc81d..59d14d6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_l5a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail16.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail16.ldif
index ce3cac8..8d02d74 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail16.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail16.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail17.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail17.ldif
index ce3cac8..8d02d74 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail17.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail17.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail3.ldif
index ce3cac8..8d02d74 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail4.ldif
index ce3cac8..8d02d74 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail5.ldif
index ce3cac8..8d02d74 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_mail5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4.ldif
index 5746f00..a8c3d81 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4a.ldif
index 0d2da17..0f68ebd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_st4a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17.ldif
index 548a9df..dc2024a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17a.ldif
index 7f433ec..272844d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_street17a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6.ldif
index 605cfe1..3f36a80 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6a.ldif
index b9ae981..4c4ba3e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targattrfilter/replace_title6a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif
index 14291ce..4c44661 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif
index fc70a0d..dbe03ae 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif
index 4cf6db5..e4a2966 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci12.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci12.ldif
index ad8c1f2..dfb7731 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci12.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci12.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci13.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci13.ldif
index 090a4f4..63133bb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci13.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci13.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci21.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci21.ldif
index 09941b3..db3c31c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci21.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci21.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci22.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci22.ldif
index 912b48d..ada9ab7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci22.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci22.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci23.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci23.ldif
index 8d95167..18e1d47 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci23.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci23.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci24.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci24.ldif
index 7180779..d3d7bcd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci24.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci24.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci25.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci25.ldif
index 09b20d7..a729035 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci25.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci25.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci26.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci26.ldif
index 0ad649f..79cc5d4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci26.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci26.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci27.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci27.ldif
index 52383d2..bbc9b5a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci27.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci27.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci28.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci28.ldif
index bdafe9c..8ef552e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci28.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci28.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif
index 5265c7f..8195f8e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci31.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci31.ldif
index c3a4e46..e6f81f3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci31.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci31.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci32.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci32.ldif
index 596aa60..b696366 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci32.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci32.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci33.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci33.ldif
index b20d2e2..41c6d5e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci33.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci33.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci34.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci34.ldif
index acd35f6..007d0b5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci34.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci34.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif
index e6c59c7..3676936 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif
index 93de881..e714553 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif
index 8596410..6704b93 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif
index cfc189f..1afe0b1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif
index 9587e9e..20ecad2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif
index bde3a17..b37c99c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif
index eed889d..30ac756 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_aci9a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif
index 721a876..958f194 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/add_entries1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif
index 7bd4324..57cb9f2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif
index ed35cd4..be5af06 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/del_aci_from_entries.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31.ldif
index 72860c6..3ab21a6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31a.ldif
index daf1d17..f046d9c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31b.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31b.ldif
index 6603c1d..5c88048 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31b.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31b.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31c.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31c.ldif
index 269bb99..353c592 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31c.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry31c.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32.ldif
index 72860c6..3ab21a6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32c.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32c.ldif
index 269bb99..353c592 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32c.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_target/mod_entry32c.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci1.ldif
index 225c7b2..7eb0f1c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci10.ldif
index d066c07..2c82ba2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci11.ldif
index 711c9ab..3ee99d2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci2.ldif
index 105d184..a2e3e21 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci3.ldif
index e96d12d..cba358a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci4.ldif
index 9941b9e..a6ca444 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci5.ldif
index 3aa200a..284b837 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci6.ldif
index 397565d..f676540 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci7.ldif
index bf6f57d..47fa9b4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci8.ldif
index ce00c83..544e597 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci9.ldif
index da9ee7f..92418f0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/add_aci9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/del_aci.ldif
index 7bd4324..57cb9f2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetattr/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_aci2.ldif
index 2def278..afddbba 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_effrights_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_effrights_aci.ldif
index 8ded8aa..91e5c71 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_effrights_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/add_effrights_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_aci.ldif
index 7bd4324..57cb9f2 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_effrights_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_effrights_aci.ldif
index 8c8a2e2..bb0756d 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_effrights_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetcontrol/del_effrights_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci1.ldif
index be9ea6a..8d8df33 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci10.ldif
index 789b770..9c37e76 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci11.ldif
index 35fd556..2a9e5e8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci12.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci12.ldif
index 22b53d5..ea828a7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci12.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci12.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci13.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci13.ldif
index f9c941f..3820884 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci13.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci13.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci14.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci14.ldif
index 6ee25d5..654d655 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci14.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci14.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci15.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci15.ldif
index 3d50577..02f620c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci15.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci15.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci2.ldif
index cb1480d..dc10004 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3.ldif
index 66040bf..18dace3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3a.ldif
index 8b2c03f..ef31988 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci3a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci4.ldif
index 975b208..d69e624 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci5.ldif
index b9c9c5d..ab50076 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6.ldif
index 5fd400d..74d8dae 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6a.ldif
index 4e5c345..ab62ea2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci6a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci7.ldif
index 051c07d..9ffc532 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci8.ldif
index 0c2281c..0625dca 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci9.ldif
index 234b23d..3b8b419 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/add_aci9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif
index 7bd4324..57cb9f2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetfilter/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/aci_startup_targetscope.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/aci_startup_targetscope.ldif
index eacc76b..5302bcc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/aci_startup_targetscope.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/aci_startup_targetscope.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci1.ldif
index fb2ba9a..6f4cbf7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci2.ldif
index a39730f..ad98fb5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci3.ldif
index 90aeb4b..5548894 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci4.ldif
index d00083b..082c51c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci1.ldif
index 2462e8d..7641b9b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci2.ldif
index adb262e..5369494 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci3.ldif
index 3990a68..b724bc6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/add_syntax_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/del_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/del_aci.ldif
index ed37da9..e2e0193 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/del_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/aci_targetscope/del_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/del_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/del_entry1.ldif
index 5c7e9f3..28fe259 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/del_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/del_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry1.ldif
index 2d7dd5b..db838ba 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry2.ldif
index 2b9716b..883f4fc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry3.ldif
index 89f28c2..aed17ef 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_entry3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_modifier_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_modifier_entry1.ldif
index 62448cd..1f50a2b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_modifier_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/mod_modifier_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/modrdn_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/modrdn_entry1.ldif
index 4dda643..4520b7e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/modrdn_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/global_acis/modrdn_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/aci_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/aci_startup.ldif
index 188bce8..dc64678 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/aci_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/aci_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_day.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_day.ldif
index fa9ea44..19d28c5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_day.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_day.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_time.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_time.ldif
index 133c2cf..9a65a90 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_time.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_bad_time.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_day.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_day.ldif
index 014ad5d..928b340 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_day.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_day.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_domain.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_domain.ldif
index 2a17d5a..cf1360f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_domain.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_domain.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_time.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_time.ldif
index 4dde2dc..c2a46e6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_time.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_right_time.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wildcard_domain.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wildcard_domain.ldif
index 584608b..423e18f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wildcard_domain.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wildcard_domain.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_day.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_day.ldif
index 894c85c..291679f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_day.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_day.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_domain.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_domain.ldif
index 0aa398e..f986d98 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_domain.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_domain.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_time.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_time.ldif
index 456c03d..b006ef6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_time.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/add_aci_wrong_time.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/replace_l.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/replace_l.ldif
index 96e5da8..21883d4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/replace_l.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/manual_tests/replace_l.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif
index fd7f219..8dc3449 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci1.ldif
index 28ec7a2..bfdb7b3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci10.ldif
index 4bd44c7..d4e117f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci10.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci11.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci11.ldif
index f9d862d..d1be55e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci11.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci11.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci12.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci12.ldif
index 75d7f0a..892dc5e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci12.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci12.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci13.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci13.ldif
index 1846e82..41d8c00 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci13.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci13.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci14.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci14.ldif
index 622495c..9e38ac2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci14.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci14.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci2.ldif
index 8e50314..1d37a36 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci3.ldif
index 3353245..005f8f3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci31.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci31.ldif
index fcccbb9..41871d5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci31.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci31.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci32.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci32.ldif
index 9a059c4..2905459 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci32.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci32.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci33.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci33.ldif
index 872edb3..8a7953d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci33.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci33.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci34.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci34.ldif
index 23e8c8a..6c242bb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci34.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci34.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci35.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci35.ldif
index e0ec088..d6fcdf9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci35.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci35.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci36.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci36.ldif
index 1bc88c1..656fc61 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci36.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci36.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci37.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci37.ldif
index df39b18..e15c666 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci37.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci37.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci38.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci38.ldif
index c6a2003..ae3cc5b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci38.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci38.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci39.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci39.ldif
index 1207153..d72190d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci39.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci39.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci4.ldif
index 50b78a7..ca3bcfd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci5.ldif
index 8ea80b8..8bb2f3e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci6.ldif
index 473ee30..57741b9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci7.ldif
index ce426ac..0a21d5d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci8.ldif
index d34d30a..cbbe9f3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci9.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci9.ldif
index fc9a726..2d638e3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci9.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/add_aci9.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_modify.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_modify.ldif
index f15b2a1..0f678c0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_modify.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_modify.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_search.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_search.ldif
index 9eca0e6..b25dcdb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_search.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/del_aci_search.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif
index a13e50f..bec4c74 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/mod_common_prohibited_entry.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31.ldif
index ec598a7..df57013 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31a.ldif
index 085598d..64a7fd2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l31a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32.ldif
index 71a7328..b7f9d4f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32a.ldif
index 2b1f72a..0b59b30 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l32a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33.ldif
index 71a7328..b7f9d4f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33a.ldif
index 2b1f72a..0b59b30 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l33a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34.ldif
index baad0e0..9631c95 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34a.ldif
index 6ba7ae2..cecd066 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l34a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35.ldif
index baad0e0..9631c95 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35a.ldif
index 6ba7ae2..cecd066 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l35a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36.ldif
index 6e0c378..50bc40b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36a.ldif
index fa38621..7949991 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l36a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37.ldif
index 6e0c378..50bc40b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37a.ldif
index fa38621..7949991 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l37a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38.ldif
index 6e0c378..50bc40b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38a.ldif
index fa38621..7949991 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l38a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39.ldif
index 6e0c378..50bc40b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39a.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39a.ldif
index fa38621..7949991 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39a.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_l39a.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail31.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail31.ldif
index a0a785b..50ed5a3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail31.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail31.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail32.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail32.ldif
index 936c593..4a44f38 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail32.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail32.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail33.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail33.ldif
index 936c593..4a44f38 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail33.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_mail33.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title34.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title34.ldif
index 5992760..c8733e3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title34.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title34.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title35.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title35.ldif
index 5992760..c8733e3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title35.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title35.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.1.ldif
index 2be7627..7c877bf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.ldif
index a71ae8e..eff5f49 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title36.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.1.ldif
index 2be7627..7c877bf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.ldif
index a71ae8e..eff5f49 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title37.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.1.ldif
index 2be7627..7c877bf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.ldif
index a71ae8e..eff5f49 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title38.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.1.ldif
index 2be7627..7c877bf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.ldif
index a71ae8e..eff5f49 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/aci/multiple_aci_tests/replace_title39.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Append.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Append.ldif
index 9cc76db..0a99c5f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Append.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Append.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif
index 929d1af..e9fb97c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Example.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Exclude.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Exclude.ldif
index 79ef2ac..9fe3e10 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Exclude.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Exclude.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Include.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Include.ldif
index 1d9c780..433f34c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Include.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Include.ldif
@@ -5,16 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
+# 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Schema.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Schema.ldif
index 2f2faea..1201f26 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Schema.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/Schema.ldif
@@ -5,16 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
+# 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/backend_start.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/backend_start.ldif
index 2deaef2..23d21e7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/backend_start.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/backend_start.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Append.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Append.ref
index 498b4b7..e6fa31b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Append.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Append.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Complex_Filter_Exclude.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Complex_Filter_Exclude.ref
index 722b8ba..b4c708e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Complex_Filter_Exclude.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Complex_Filter_Exclude.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Exclude_Attribute.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Exclude_Attribute.ref
index 621d9b0..1d687f1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Exclude_Attribute.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Exclude_Attribute.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Exclude_Branch.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Exclude_Branch.ref
index b8bb8a0..11dca97 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Exclude_Branch.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Exclude_Branch.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Excludes.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Excludes.ref
index 05cf35d..627e21e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Excludes.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Excludes.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Include.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Include.ref
index 44b8127..84e7719 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Include.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Include.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Includes.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Includes.ref
index 45f8bd6..0a4e797 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Includes.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Filtered_Includes.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Attribute.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Attribute.ref
index a1c3811..2c64fef 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Attribute.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Attribute.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Branch.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Branch.ref
index b5a5719..f997074 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Branch.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Branch.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Branch_Wrap.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Branch_Wrap.ref
index 33245f0..ccf76e6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Branch_Wrap.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Include_Branch_Wrap.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_Fractional_Filtered.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_Fractional_Filtered.ref
index 3fd0e82..1b00681 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_Fractional_Filtered.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_Fractional_Filtered.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_IncludeBranch_IncludeAttribute.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_IncludeBranch_IncludeAttribute.ref
index 992f2f4..d5c9aad 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_IncludeBranch_IncludeAttribute.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_IncludeBranch_IncludeAttribute.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_Include_Exclude_Branch.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_Include_Exclude_Branch.ref
index 465c3f2..34bb1f0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_Include_Exclude_Branch.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Mix_Include_Exclude_Branch.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Exclude_Attribute.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Exclude_Attribute.ref
index de9c3be..090388e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Exclude_Attribute.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Exclude_Attribute.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Exclude_Branch.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Exclude_Branch.ref
index bdf2f45..a5297c4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Exclude_Branch.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Exclude_Branch.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Include_Attribute.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Include_Attribute.ref
index 46e1e6f..2b3886a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Include_Attribute.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Include_Attribute.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Include_Branch.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Include_Branch.ref
index 20eb762..fdfe64b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Include_Branch.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/Multiple_Include_Branch.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/default.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/default.ldif
index 2b5dffe..2f49512 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/default.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/default.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/defaultBackEnd.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/defaultBackEnd.ref
index ca95b18..8bf5f28 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/defaultBackEnd.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/defaultBackEnd.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/delete.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/delete.ldif
index f93e425..4697d14 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/delete.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/delete.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/nonDefault.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/nonDefault.ldif
index c977285..8945dd2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/nonDefault.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/nonDefault.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/nonDefaultBackEnd.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/nonDefaultBackEnd.ref
index d88df91..7a738c5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/nonDefaultBackEnd.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/nonDefaultBackEnd.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/search.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/search.ldif
index be709f1..641517d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/search.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/export_tasks_ldif/search.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/nonDefault.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/nonDefault.ldif
index c977285..8945dd2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/nonDefault.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/backends/nonDefault.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/clu_start.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/clu_start.ldif
index 03fb5e7..f1b47cb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/clu_start.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/clu_start.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif
index 4e02f35..8f777a0 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkbehavior.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif
index a30fc12..c15c576 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldapmodify_checkoptions.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_checkbehavior.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_checkbehavior.ldif
index f32d528..461cc17 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_checkbehavior.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldif-diff_checkbehavior.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify.ref b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify.ref
index de3ac58..ddfd5f4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify.ref
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify.ref
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_checkbehavior.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_checkbehavior.ldif
index 86da2ca..90f0f3f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_checkbehavior.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_checkbehavior.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_concurrente.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_concurrente.ldif
index efc21cf..dbe05d5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_concurrente.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_concurrente.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_moddn.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_moddn.ldif
index a6b69e3..122c28b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_moddn.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/clu/ldifmodify_moddn.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control1.ldif
index cb06185..3ca9d09 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control2.ldif
index 2288a57..0ea4575 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/control2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_start.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_start.ldif
index 4e01a0a..c01d311 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_start.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_start.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif
index 9cdd888..66c58a0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_test_1K.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_add_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_add_aci.ldif
index bae8618..c0bcfe6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_add_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_add_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_delete_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_delete_aci.ldif
index 619f4a7..406ab67 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_delete_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_assertion_delete_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_add_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_add_aci.ldif
index f9a743f..5d915d5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_add_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_add_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_delete_aci.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_delete_aci.ldif
index eb11ef4..bf02c67 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_delete_aci.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/ctrls_matched_values_delete_aci.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif
index 01c7424..038b313 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif
index d0c2bef..4c8646e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif
index 702b287..77926e6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif
index f7864b4..88ce350 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_entrycache5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif
index 0ad4d05..bece43f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif
index 0500138..1a3c76d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif
index 0528f52..1a5a63e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif
index 91c4341..8d7967e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_searchsizelimit4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif
index 98526f6..35c1d20 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif
index 2f40a49..e9e2169 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif
index 5720345..c5897ff 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif
index c6d871d..b64a859 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/mod_timelimit4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/add.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/add.ldif
index 461b946..ea48a35 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/add.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/add.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/moddn.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/moddn.ldif
index 32c24b5..3dcc1e6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/moddn.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/moddn.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/modify.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/modify.ldif
index 38e1b4d..f4b8d4b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/modify.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/add/modify.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/default.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/default.ldif
index 59e13cb..0ef3af4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/default.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/default.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/add.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/add.ldif
index d8bf40e..9ec7183 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/add.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/add.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/moddn.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/moddn.ldif
index 9896208..b023c3d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/moddn.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/moddn.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/modify.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/modify.ldif
index 12dd3e4..5dec1ff 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/modify.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/delete/modify.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/add.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/add.ldif
index 6b877d0..bf64cdb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/add.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/add.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/moddn.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/moddn.ldif
index 2660ec6..3e4e771 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/moddn.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/moddn.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/modify.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/modify.ldif
index 0271c31..554c629 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/modify.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/moddn/modify.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/add.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/add.ldif
index c6c283b..2f6b1cb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/add.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/add.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/moddn.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/moddn.ldif
index cd645d2..2ff2cf0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/moddn.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/moddn.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/modify.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/modify.ldif
index 4d4330d..caad3b6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/modify.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/core/psearch/modify/modify.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-description.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-description.ldif
index b10d159..fa4dfb2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-description.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-description.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-master.template b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-master.template
index ce44046..2dfa6ba 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-master.template
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-master.template
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterAdd.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterAdd.ldif
index 870a8a6..964065c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterAdd.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterAdd.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModify.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModify.ldif
index f6d0428..4073c62 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModify.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModify.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModifyDN.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModifyDN.ldif
index f8c35df..58f1d45 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModifyDN.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModifyDN.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModifyDN.template b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModifyDN.template
index 27843a5..c750cad 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModifyDN.template
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterModifyDN.template
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterOnlineImport.template b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterOnlineImport.template
index a0bdfdf..bdd16f7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterOnlineImport.template
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-masterOnlineImport.template
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-replicaExcludeAdd.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-replicaExcludeAdd.ldif
index a441989..42f90d6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-replicaExcludeAdd.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-replicaExcludeAdd.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-replicaIncludeAdd.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-replicaIncludeAdd.ldif
index 617f1c5..a0ab4ad 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-replicaIncludeAdd.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/fractional-replication/basic-replicaIncludeAdd.ldif
@@ -1,18 +1,20 @@
+# 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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/entry_acis.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/entry_acis.ldif
index a6fd04c..1074b2b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/entry_acis.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/entry_acis.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/global_acis.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/global_acis.ldif
index 804834b..f5af0b5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/global_acis.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/global_acis.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/groups.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/groups.ldif
index c0b95cf..f95b472 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/groups.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/groups/groups.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry1.ldif
index 6aba12e..889a5ec 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry2.ldif
index 020e5a4..f4188e4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry_preencoded_pwd.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry_preencoded_pwd.ldif
index 40533dd..a8c447e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry_preencoded_pwd.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_entry_preencoded_pwd.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_new_root_user.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_new_root_user.ldif
index bde6f2e..acb4b7d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_new_root_user.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_new_root_user.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_sales_person.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_sales_person.ldif
index 8741653..da6fe87 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_sales_person.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/add_sales_person.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/pwp_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/pwp_startup.ldif
index dc5eb7e..d6c7724 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/pwp_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/password_policy/pwp_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_entry_with_new_objclass.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_entry_with_new_objclass.ldif
index 2dc8ae7..900e71e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_entry_with_new_objclass.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_entry_with_new_objclass.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_new_root_user.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_new_root_user.ldif
index de3eb53..af18569 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_new_root_user.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/add_new_root_user.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/addmozobj.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/addmozobj.ldif
index 67044f8..1a26448 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/addmozobj.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/addmozobj.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_import_task/import_task.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_import_task/import_task.ldif
index 0517cdd..b82c6e3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_import_task/import_task.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_import_task/import_task.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/del_entry.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/del_entry.ldif
index 0b2b37f..eac4c95 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/del_entry.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/del_entry.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/restore_task.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/restore_task.ldif
index fa9132e..17beb19 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/restore_task.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_restore_task/restore_task.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_startup.ldif
index b22f8ac..344f5bc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_unindexed_searches/50Entries.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_unindexed_searches/50Entries.ldif
index 40d1ec9..ccb85f8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_unindexed_searches/50Entries.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/privileges/privileges_unindexed_searches/50Entries.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/AD.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/AD.ldif
index 05abfdf..2a5caca 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/AD.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/AD.ldif
@@ -6,18 +6,17 @@
 # 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/CDDLv1_0.txt
+#
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
 # or http://forgerock.org/license/CDDLv1.0.html.
 # 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/CDDLv1_0.txt.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/AD10.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/AD10.ldif
index 546744f..d4d4a95 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/AD10.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/AD10.ldif
@@ -6,18 +6,17 @@
 # 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/CDDLv1_0.txt
+#
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
 # or http://forgerock.org/license/CDDLv1.0.html.
 # 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/CDDLv1_0.txt.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/Example.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/Example.ldif
index def170d..0c58e08 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/Example.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/pta/Example.ldif
@@ -6,18 +6,17 @@
 # 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/CDDLv1_0.txt
+#
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
 # or http://forgerock.org/license/CDDLv1.0.html.
 # 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/CDDLv1_0.txt.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/quickstart/quickstart.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/quickstart/quickstart.ldif
index 87de96e..d628878 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/quickstart/quickstart.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/quickstart/quickstart.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/Example.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/Example.ldif
index fe8a289..2851ddb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/Example.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/Example.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/Short_Example.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/Short_Example.ldif
index b2f22f7..5c9ab0d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/Short_Example.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/Short_Example.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-0.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-0.ldif
index eb9b5b4..59cf1dd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-0.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-0.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-1.ldif
index c304ef8..a85595a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-2.ldif
index 10e3a74..0f3646c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/newtestuser-2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-0.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-0.ldif
index dbed17b..83d7d56 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-0.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-0.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-1.ldif
index f85edd0..6fd7cf9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-2.ldif
index 32fb660..1111a8d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-3.ldif
index 7344c56..8f3122d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/schemamods-3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-0.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-0.ldif
index 101130e..63c5ea1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-0.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-0.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-1.ldif
index b0c55aa..d98055f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-2.ldif
index 52e5e1d..992fca0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/testuser-2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/tfitter.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/tfitter.ldif
index d6ebb17..e834a12 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/tfitter.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/replication/tfitter.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/05-DynamicSchemaAdd.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/05-DynamicSchemaAdd.ldif
index a875b19..378752e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/05-DynamicSchemaAdd.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/05-DynamicSchemaAdd.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif
index e32f467..cb60bb6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif
index 961f904..55bcfb2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif
index 41dc2ac..a9c4aeb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/changelog_3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif
index 94a4d3c..3294c0e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_schema_checking.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif
index 5aeb0cc..9e340e6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/disable_syntax_checking.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema1.ldif
index dabdd51..d5e6ae0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema2.ldif
index 6eae2d4..45ce9db 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema3.ldif
index 8561663..e3c0998 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema4.ldif
index c4b7710..1e7fe3d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema5.ldif
index cc6b81f..6e56e16 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema6.ldif
index 4d39b58..5b41f82 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema7.ldif
index 4094299..0b7f7435 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema8.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema8.ldif
index f60cdea..5c3e35b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema8.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/dynamic_schema8.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif
index 2951265..b2eb2a4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_schema_checking.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif
index a33b03a..8e7268a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/enable_syntax_checking.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif
index fb17d08..c88952e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif
index 16e5e28..fe665c9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif
index 28541d8..be35496 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldap_cosine_3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif
index be73a7e..076165a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif
index c05ff49..4a9ac28 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif
index b28095a..781aef6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/ldup_subentry_3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif
index 5551d32..449c2a3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif
index 2b2a6b7..6d2cbce 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/namedobject_2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif
index 04f7f54..63d6471 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2079.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif
index 2a303ff..4be55ab 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif
index 4e75d9a..798670d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif
index c07647f..345a566 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif
index 9b47c11..12ca12c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif
index 9269b0b..7197fab 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2247_5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif
index df00f46..ef4269c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif
index ef19f20..c2ca233 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif
index 4c9d8fa..3cfb074 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif
index 59c7b04..56806ea 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2307bis_4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif
index 0fe6a21..9f201e8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2377.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif
index 487221f..4c86f2e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2713.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif
index e0b31eb..aa24150 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif
index e7a1e09..5f314a0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2714_2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif
index 54d8c60..3fa7b6d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2739.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif
index bcbeb0a..d3fd1de 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc2798.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif
index 48bb032..f499118 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif
index 19f9d0c..7d04057 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc3045_2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif
index b319051..6f51ede 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif
index 87b1d40..99b3765 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif
index 1602522..b485fde 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif
index 8d1f828..32ea658 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif
index 0690134..2324138 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif
index bf21047..a625b89 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_6.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif
index 7623b2f..beaae16 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/rfc4403_7.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif
index 1cf76dd..cd7a758 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/schema_start.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif
index 0a7c5dc..5f36ff0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/untypedobject.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema.ldif
index c6676e9..d806b51 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema2.ldif
index d445f25..1843d36 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema3.ldif
index 889f593..2acb886 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema4.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema4.ldif
index bbc5f0f..c09000f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema4.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema4.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema5.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema5.ldif
index 288903d..34fcfa9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema5.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/ldifs/updateSchema5.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/solaris/rfc4876.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/solaris/rfc4876.ldif
index bce87ac..4d01fec 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/solaris/rfc4876.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/solaris/rfc4876.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/solaris/solaris.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/solaris/solaris.ldif
index eb8d483..e826146 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/solaris/solaris.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/schema/solaris/solaris.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif
index 95c14a3..caa7a4f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/account_activation/account_activation_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif
index 9aa4dbb..463d5eb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_policy.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif
index 0498007..73bd643 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif
index f3576af..f487a83 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_user2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif
index 73b0c45..a4ec992 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_MD5_users.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif
index 27ae9b3..c001e3a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_policy.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif
index f273759..ed72239 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif
index 1ec2a31..17f56b6 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_user2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif
index 5438151..dc8689c 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA1_users.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif
index ba5d67e..3348292 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_policy.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif
index f84dc3f..63372e7 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif
index d2db58a..c693e15 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_user2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif
index 228c2ef..8d8a8e8 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA256_users.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif
index 54c3194..8cbc5e3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_policy.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif
index a6a497f..bc84d40 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif
index a6a1049..dfe9f76 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_user2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif
index dd0351c..3e1b7b5 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA384_users.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif
index e47e712..7bbcacf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_policy.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif
index 56535a7..94fe210 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif
index 991cd61..6f81e9b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_user2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif
index d1834b7..b44a2d5 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_SHA512_users.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif
index f734c51..7d1e665 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_add_def_users.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif
index 8e79444..d301547 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_del_new_policy.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif
index ab4349e..40a116f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif
index b289929..2a76986 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/admin_mod_def_policy2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif
index 4e1cc4f..2ab991c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/auth_pwd_syntax/auth_pwd_syntax_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif
index f700a3a..563846d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/bind_no_pwd/bind_no_pwd_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif
index 8c5ef25..e5ea87a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_in.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif
index 85ce676..4f98d22 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/add/bin_a1_tls_in.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif
index fb112ca..5ccfa4e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_out.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif
index a909f12..eb3fe8e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/del/bin_a1_tls_out.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/jks_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/jks_startup.ldif
index c5533a1..6ce4bb8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/jks_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/jks_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif
index e1c72ac..4e0beb1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_mod.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif
index c28c06c..8b64ffa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/mod/bin_a1_tls_mod.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif
index c846584..cba5c0c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/jks/modrdn/a1_modrdn.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/admin_expire_account.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/admin_expire_account.ldif
index 15b7af9..7c727d5f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/admin_expire_account.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/admin_expire_account.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/security_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/security_startup.ldif
index 588a907..a6f1a8c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/security_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/manual_tests/security_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif
index 970ab05..34611e7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/add/bin_a1_in.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif
index 191a390..111b453 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/del/bin_a1_out.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif
index 7e3fc57..18d6072 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/mod/bin_a1_mod.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif
index 53d0dbd..32c3c0a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/modrdn/a1_modrdn.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif
index d2e1624..bc82dbe 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pkcs12/pkcs12_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif
index 6aba12e..889a5ec 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif
index 020e5a4..f4188e4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif
index 40533dd..a8c447e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif
index a5ac7e0..19e6b1f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_entry_preencoded_pwd2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif
index 8741653..da6fe87 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/add_sales_person.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif
index 5e53347..585700a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy/pwd_policy_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy_root/add_new_root_user.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy_root/add_new_root_user.ldif
index bde6f2e..acb4b7d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy_root/add_new_root_user.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_policy_root/add_new_root_user.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif
index 85827a0..b55895c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_storage/pwd_storage_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif
index cd8596f..0a666ac 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/pwd_validator/pwd_validator_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_one_user.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_one_user.ldif
index 21614a9..7487fdd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_one_user.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_one_user.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif
index 7952be3..585bb5d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/admin_del_realm.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif
index b20efcc..d8ad504 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/sasl/sasl_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif
index 1f657b2..b93de1d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/add/bin_a1_tls_in.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif
index 0b8477d..f96369c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/del/bin_a1_tls_out.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif
index bfb1560..8467332 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif
index e643e6d..b90cd9c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/add_entry2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif
index 165b9eb..6448955 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_add.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif
index b8d5cee..aa1db69 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_force_pwd_reset.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif
index 82bc3fe..6fe2389 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif
index 03a41fa..16ba83e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif
index f5251ea..9af50f4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_change_user_pwd3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif
index a311042..83d5918 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_disable_max_reset_age.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif
index 8415994..3748e61 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_long.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif
index 5c5cc6a..f3f6d4b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_enable_max_reset_age_short.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif
index b2423c6..9259c28 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_add.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif
index 74e2b20..51d7ae2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/admin_reset_force_pwd_reset.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif
index 5ca80b1..4b28986 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_add_attr.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif
index 32d3a34..058ee97 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_force_pwd.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif
index 754e743..24e1f42 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd1.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif
index 5980562..ea8a066 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd2.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif
index 38974a2..675516e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_change_pwd3.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif
index 6280242..0ed317c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/force_pwd_change/user_del_attr.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif
index ecc7155..2d945d6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/mod/bin_a1_tls_mod.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif
index 3d32ccc..dcc1314 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/security/startTLS/starttls_startup.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/agent.security b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/agent.security
index d85a592..2cebb9f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/agent.security
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/agent.security
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/manager.security b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/manager.security
index cb81071..9bd97df 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/manager.security
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/manager.security
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/snmp_start.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/snmp_start.ldif
index 36885b6..d28c4b8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/snmp_start.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/snmp/snmp_start.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/tasks/import.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/tasks/import.ldif
index 17a5199..87bc440 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/tasks/import.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/tasks/import.ldif
@@ -5,16 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
+# 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/ldif_mod.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/ldif_mod.ldif
index 1e20351..61490ae 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/ldif_mod.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/ldif_mod.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif
index 58e328b..953abec 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/shared/data/virtualAttributes/virtualAttributes.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
index df92d19..bac2ab7 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry.xml
index 7bd1cb6d1..79fe537 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry_tests.xml
index a42a4d3..30cc83c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/add_entry/add_entry_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes.xml
index 2d0621f..46ba45b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes_tests.xml
index 05e91fc..f6b4ce9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/bindtypes/bindtypes_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry.xml
index f856ab1..540915f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml
index 54f4baa..2eaa25e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/compare_entry/compare_entry_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry.xml
index e5466ae..d429f87 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry_tests.xml
index db0eedf..58bd82e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/delete_entry/delete_entry_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights.xml
index 460e600..4ce548b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights_tests.xml
index cac16b2..9409d48 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/effective_rights/effective_rights_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis.xml
index 824ec85..4a16f1e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis_tests.xml
index 6edba83..71c151c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis/global_acis_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/import/import.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/import/import.xml
index ccc1365..4a973fc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/import/import.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/import/import.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/import/import_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/import/import_tests.xml
index 1da6fb1..3a50993 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/import/import_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/import/import_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue1269 b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue1269
index 1268556..af41ab6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue1269
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue1269
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue462 b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue462
index d5931d1..74ff184 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue462
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue462
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue464 b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue464
index 8335dfa..cde86cb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue464
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue464
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue465 b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue465
index 2f0ceed..ac77438 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue465
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/manual_tests/README_Issue465
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry.xml
index 613415a..627f5f7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry_tests.xml
index 6ad2e56..8951a74 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_entry/modify_entry_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter.xml
index 863e4f6..06da680 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter_tests.xml
index 8a030f2..01a3cb6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_filter/modify_filter_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn.xml
index 2165a97..7dbeaac 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn_tests.xml
index da8bea6..edf94aa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/modify_rdn/modify_rdn_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis.xml
index 72b6a5c..64ebe2b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis_tests.xml
index c192184..118cab6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/multi_acis/multi_acis_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth.xml
index 1a1ec14..edb2b9c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth_tests.xml
index ebc7e43..e1b57dd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/proxy_auth/proxy_auth_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards.xml
index 6419111..281a8e9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards_tests.xml
index fe7d50a..3fb982f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/rdn_wildcards/rdn_wildcards_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter.xml
index 834c36aa..fa0ab0b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter_tests.xml
index 0ef913e..9cd2e0b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targattrfilter/targattrfilter_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/target/target.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/target/target.xml
index cb5db5a..87b5b83 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/target/target.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/target/target.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/target/target_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/target/target_tests.xml
index 29ee98d..125d062 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/target/target_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/target/target_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr.xml
index 24b317a..3524ae8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr_tests.xml
index 2224b8e..4a7c2e1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetattr/targetattr_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol.xml
index 3567667..ced114e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol_tests.xml
index 274d64d..d2c9b4d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetcontrol/targetcontrol_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter.xml
index 64ae941..5e6d459 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter_tests.xml
index 9d9bac6..cc5d8b2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetfilter/targetfilter_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetscope/targetscope.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetscope/targetscope.xml
index 5142706..0ac2af4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetscope/targetscope.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetscope/targetscope.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetscope/targetscope_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetscope/targetscope_tests.xml
index e86ec24..a8082d0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetscope/targetscope_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/targetscope/targetscope_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
index 51ec219..ab9637d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml
index 20a9b4a..049d96b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks_tests.xml
index 63183d2..61ee492 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup.xml
index f863432..d606bfd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml
index 7975205..d0781ae 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backup/backup_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml
index 2ec6f10..0091c7e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml
index 9bd5eea..50d8b6e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml
index 6525dea..0d6d157 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
index 2cb4b9f..a3a8897 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export.xml
index 558701f..32522c1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml
index 1fe20ff..d963ac8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export/export_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml
index 5e48ad9..35cab69 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
index 3555f40..ccd8f22 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import.xml
index 0d55da7..bec83ed 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
index 6aa1154..d65fde1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/manual_tests/README_issue588 b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/manual_tests/README_issue588
index f1f2233..cfde494 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/manual_tests/README_issue588
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/manual_tests/README_issue588
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml
index 5cca616..cdb37ba 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
index bdc73dc..a9bc73c 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore.xml
index 891e817..3c29a9c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml
index 510c782..9d2ff6a 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore/restore_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
index 6e3ac70..ae39594 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml
index bf2f157..5d9da9d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_base64_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
index 96b627a..55560fd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml
index 7a6374e..6a5bfe6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_encode-password_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml
index 1145894..fe43333 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapcompare_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml
index 5272e1d..84541e9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapdelete_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
index 00fda16..c8a1669 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
index 31c4b73..0f32f20 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapmodify_checkoptions.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml
index 40ad728..289a574 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldappasswordmodify_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
index 2bb8b66..3274133 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml
index 2d1965d..e1a0fbb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkoptions.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
index 0243e38..8fdc92c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
index 53d1d48..1756d4c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
index 08a61b5..3ae9d07 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml
index be98243..e50a265 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
index d1aeee7..4a8d458 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
index 40728ce..2e367cb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_manage-tasks_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
index a06fcb8..4bfd14d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml
index 536e1d7..91a96e8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_status_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml
index d7b3620..c1daff4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clu_secure.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clu_secure.xml
index 2af35ad..c758c7d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clu_secure.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clu_secure.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_cleanup.xml
index d891166..a344a3b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_jks.xml
index 2f3093f..bfab1d5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_jks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal.xml
index 13b46e4..af143c5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_equaldn.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_equaldn.xml
index ad8b33a..ab7bc56 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_equaldn.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_equaldn.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_fingerprint.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_fingerprint.xml
index 429dcd8..59cfd31 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_fingerprint.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_fingerprint.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_subjectattr.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_subjectattr.xml
index fd98efc..e330231 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_subjectattr.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_subjectattr.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_subjectdn.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_subjectdn.xml
index 2d5b33b..f820d34 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_subjectdn.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_saslexternal/clus_saslexternal_subjectdn.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_setup.xml
index 1170136..3faba25 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl.xml
index e295011..e872fdf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_cleanup.xml
index bc1d11e..3082eae 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapcompare.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapcompare.xml
index daa3213..19837af 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapcompare.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapcompare.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapdelete.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapdelete.xml
index 1f4643d..1c568dd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapdelete.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapdelete.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapmodify.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapmodify.xml
index f74f15e..273e7aa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapmodify.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapmodify.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldappasswdmodify.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldappasswdmodify.xml
index 8fc645c..b5228b6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldappasswdmodify.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldappasswdmodify.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapsearch.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapsearch.xml
index 6791868..1d7975e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapsearch.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_ldapsearch.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_setup.xml
index 6c8c590..a3b10b1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_ssl/clus_ssl_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls.xml
index aa04fb3..d153334 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_cleanup.xml
index bd9fb59..50fd457 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapcompare.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapcompare.xml
index fbea4eb..526575f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapcompare.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapcompare.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapdelete.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapdelete.xml
index d72d99c..7baf249 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapdelete.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapdelete.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapmodify.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapmodify.xml
index cf7ada6..9d6c6dc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapmodify.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapmodify.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldappasswdmodify.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldappasswdmodify.xml
index 85e584b..f5622c8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldappasswdmodify.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldappasswdmodify.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapsearch.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapsearch.xml
index 107074c..879e7fd 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapsearch.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_ldapsearch.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_setup.xml
index 8a6c059..f431ca8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu_secure/clus_starttls/clus_starttls_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr.xml
index 04932de..5c4b81a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr_tests.xml
index 3ab41ed..d09e932 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr.xml
index 5571ba0..e271e7b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr_tests.xml
index ca08b72..ebe9802 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml
index e8abf3e..5e73be6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_assertion.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_authorization_id.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_authorization_id.xml
index e84b3f1..6ad651a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_authorization_id.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_authorization_id.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml
index 0b6f163..fdb39df 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_matched_values.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
index 95a4b69..2c6ac9c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/controls/core_ctrls_password_policy.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core.xml
index d65a431..3f63f2e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml
index 3f96a97..21c258f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml
index 002c2a8..3f62352 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_entry_cache.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml
index 5aecce6..80d11a7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml
index a237352..75d8d67 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml
index b247df4..5981f2d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_version_report.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_version_report.xml
index 4d3438d..accac11 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_version_report.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_version_report.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/filters/core_all_filters_noindex.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/filters/core_all_filters_noindex.xml
index 98af541..4e1bf15 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/filters/core_all_filters_noindex.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/filters/core_all_filters_noindex.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/filters/core_tf_filters.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/filters/core_tf_filters.xml
index 7ddbe46..230a4e8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/filters/core_tf_filters.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/filters/core_tf_filters.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml
index 67355e1..6b7096f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch_tests.xml
index 8417159..11483f4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml
index 12bfcd2..514998d 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml
index 1d582f5..f1b6a4d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml
index ed46ee6..504f3ea 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml
index 9fa9b55..cebd66d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml
index bcc8fb5..1c27853 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get.dat b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get.dat
index 88492a3..79d91e8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get.dat
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get.dat
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get2.dat b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get2.dat
index b2a46af..6577528 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get2.dat
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/get2.dat
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml
index 0687d32..81f5a1f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list_tests.xml
index dae3845..bbcce86 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/list.dat b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/list.dat
index 62a81cd..f14b700 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/list.dat
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/list.dat
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml
index 9c82c62..01e788a 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
index 355f4ab..3838bd3 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
index c1aae3b..144a6ac 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml
index d4945e5..2a31e9c 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml
index 57a5c61..e09ef64 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/config.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/config.xml
index c2a0fae..185596f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/config.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/config.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication.xml
index 98d3bca..13041ce 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_cleanup.xml
index cc57359..508091e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_setup.xml
index b7b078c..3c06458 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml
index 30d9998..1bdf5a2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/fractional-replication/utils.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml
index 72a1ee3..c0ac6f5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_dynamic.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_dynamic.xml
index 94b1bd7..6c60534 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_dynamic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_dynamic.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_lib.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_lib.xml
index 5c63bcd..2d4bc53 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_lib.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_lib.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml
index f8b0ee4..ba53af0 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_member.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_member.xml
index fe383c7..4c9d3f5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_member.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_member.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_uniquemember.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_uniquemember.xml
index a8a5cda..dac655b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_uniquemember.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_static_uniquemember.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_virtual_static.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_virtual_static.xml
index 49d0e7f..244e0d9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_virtual_static.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_virtual_static.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/groups.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/groups.xml
index a246bcb..15fe491 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/groups.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/groups.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n.xml
index 4034d7f..bf33cac 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml
index efc1d61..564e536 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_LDAPcmds.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml
index 505b4d5..708b5c8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_authentication.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml
index 2a22066..36e8b43 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_createbackend.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
index 3f53da0..3a68a37 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml
index 90259ca..f9a779f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_schemaExtension.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml
index 51ce981..fd0b781 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml
index b1082b1..92d3115 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-add.filters b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-add.filters
index c30325c..af3f2cf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-add.filters
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-add.filters
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-modify.filters b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-modify.filters
index 0ad42f8..9b68106 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-modify.filters
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-modify.filters
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-remove.filters b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-remove.filters
index d701d87..ded9a84 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-remove.filters
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/after-remove.filters
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-add.filters b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-add.filters
index d701d87..ded9a84 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-add.filters
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-add.filters
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-modify.filters b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-modify.filters
index ee2695b..52631ed 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-modify.filters
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-modify.filters
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-remove.filters b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-remove.filters
index c30325c..af3f2cf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-remove.filters
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/before-remove.filters
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
index b7fece8..b731a9f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/search.filters b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/search.filters
index 5cd4def..f0edd79 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/search.filters
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/search.filters
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging.xml
index 3328971..167e295 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml
index e55b6a2..efa5336 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_properties.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml
index 4527d51..eb4ad8f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml
index 1d4a5b5..edf31c9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_retention_properties.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
index a601715..77e88de 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml
index 20817cd..0132510 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_rotation_properties.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
index 8fa8386..16bec7f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring.xml
index 3634e5a..ac83ca5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
index afca974..79cd721 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
index 775cde9..90b459f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/allow_user_password_changes/pwp_allow_user_password_changes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/allow_user_password_changes/pwp_allow_user_password_changes.xml
index 257a9d0..aac4f61 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/allow_user_password_changes/pwp_allow_user_password_changes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/allow_user_password_changes/pwp_allow_user_password_changes.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/allow_user_password_changes/pwp_allow_user_password_changes_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/allow_user_password_changes/pwp_allow_user_password_changes_tests.xml
index 74f69d5..d55372d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/allow_user_password_changes/pwp_allow_user_password_changes_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/allow_user_password_changes/pwp_allow_user_password_changes_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change.xml
index 1b78be2..05204bb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change_all_users_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change_all_users_tests.xml
index 6317c81..07e0c07 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change_all_users_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change_all_users_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change_tests.xml
index 34b2d4b..acc366c 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/force_pwd_change/pwp_force_pwd_change_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/grace_login/pwp_grace_login.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/grace_login/pwp_grace_login.xml
index 6fddd19..5348e96 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/grace_login/pwp_grace_login.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/grace_login/pwp_grace_login.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/grace_login/pwp_grace_login_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/grace_login/pwp_grace_login_tests.xml
index 1fc4275..5d8d5c9 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/grace_login/pwp_grace_login_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/grace_login/pwp_grace_login_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/last_login/pwp_last_login.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/last_login/pwp_last_login.xml
index 3c38789..8d4c135 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/last_login/pwp_last_login.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/last_login/pwp_last_login.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/last_login/pwp_last_login_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/last_login/pwp_last_login_tests.xml
index a907f3a..c56fadf 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/last_login/pwp_last_login_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/last_login/pwp_last_login_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout.xml
index 487dea9..3c6fed7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout_duration_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout_duration_tests.xml
index e76aa5a..c066af1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout_duration_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout_duration_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout_failure_count_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout_failure_count_tests.xml
index 8bbcf20..dc3ac04 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout_failure_count_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/lockout/pwp_lockout_failure_count_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/max_pwd_age/pwp_max_pwd_age.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/max_pwd_age/pwp_max_pwd_age.xml
index 32f6ba1..71e0e3f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/max_pwd_age/pwp_max_pwd_age.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/max_pwd_age/pwp_max_pwd_age.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/max_pwd_age/pwp_max_pwd_age_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/max_pwd_age/pwp_max_pwd_age_tests.xml
index e2a7eda..6ca4f8a 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/max_pwd_age/pwp_max_pwd_age_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/max_pwd_age/pwp_max_pwd_age_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/min_pwd_age/pwp_min_pwd_age.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/min_pwd_age/pwp_min_pwd_age.xml
index 450ba71..0f218a3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/min_pwd_age/pwp_min_pwd_age.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/min_pwd_age/pwp_min_pwd_age.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/min_pwd_age/pwp_min_pwd_age_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/min_pwd_age/pwp_min_pwd_age_tests.xml
index 70be4de..aa84ed6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/min_pwd_age/pwp_min_pwd_age_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/min_pwd_age/pwp_min_pwd_age_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/non_default/pwp_non_default.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/non_default/pwp_non_default.xml
index 61131c3..a82ce7a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/non_default/pwp_non_default.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/non_default/pwp_non_default.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/non_default/pwp_non_default_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/non_default/pwp_non_default_tests.xml
index 872a18a..14200fc 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/non_default/pwp_non_default_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/non_default/pwp_non_default_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/password_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/password_policy.xml
index 2f4b19c..cd94cb7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/password_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/password_policy.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/preencoded_pwds/pwp_preencoded_pwds.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/preencoded_pwds/pwp_preencoded_pwds.xml
index 7cf3264..dac1928 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/preencoded_pwds/pwp_preencoded_pwds.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/preencoded_pwds/pwp_preencoded_pwds.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/preencoded_pwds/pwp_preencoded_pwds_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/preencoded_pwds/pwp_preencoded_pwds_tests.xml
index 106816e..8411873 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/preencoded_pwds/pwp_preencoded_pwds_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/preencoded_pwds/pwp_preencoded_pwds_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_auth_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_auth_tests.xml
index 41da3d2..95b2107 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_auth_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_auth_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_policy.xml
index 5a4f89f..35d39f2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_policy.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_user_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_user_tests.xml
index 7d8c84a..bf37f4b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_user_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/password_policy/root_policy/pwp_root_user_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins.xml
index ae6ad3b..f90ca31 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml
index 6f695be..6a131c2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_7bit.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
index e2f4d05..60c3a40 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_entryUUID.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml
index b10f975..63feddd 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_lastmod.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
index 14bbebc..a2fc32f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml
index 6a8046b..e2ff7fc 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_uniqueness.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges.xml
index 4fe4434..13be050 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_acis.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_acis.xml
index 87af3f5..2533f31 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_acis.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_acis.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml
index afe8080..69dfd6a 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_backup_task.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
index 68a102e..0429759 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml
index c5b85e2..3905582 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_export_task.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml
index 6e5b03c..1533331 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_import_task.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
index 845f0e8..e673463 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml
index e7d5280..dae0ade 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_restore_task.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
index 4bb8181..a9ead04 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
index d9e824f..bcf160a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic.xml
index 8b4fd52..3621a01 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_postamble.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_postamble.xml
index 6efb9c2..238fb54 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_postamble.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_postamble.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_tests.xml
index d84b9f5..fd13c94 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/basic/pta_basic_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta.xml
index 68cf5b5..a60bed4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_cleanup.xml
index 38c7314..f1549ad 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_cleanup.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_setup.xml
index d588610..13ff7a1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/pta/pta_setup.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
index aa264a1..99d8d6c 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication-safe-data/replication-safe-data.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication-safe-data/replication-safe-data.xml
index de30da4..a01988c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication-safe-data/replication-safe-data.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication-safe-data/replication-safe-data.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication-safe-read/replication-safe-read.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication-safe-read/replication-safe-read.xml
index f59c584..16c1599 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication-safe-read/replication-safe-read.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication-safe-read/replication-safe-read.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml
index 64e47ae..54b1cf2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci_tests.xml
index 52c76ca..8a83ff4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/aci/aci_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
index 8b79ee3..4d69243 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic_tests.xml
index 0108717..dda1caa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml
index b1573c8..68707d6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/basic/replication_basic_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
index fadcc69..19b493d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy_tests.xml
index 9d1bb28..1771762 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
index 39c7b88..2e5f085 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml
index 553d0a5..4d5337c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/changelog/changelog_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
index cb2f421..d3c9c7f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict_tests.xml
index a7a500a..24bb7b6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/conflict/conflict_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
index 1a570c1..4bdb008 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption_tests.xml
index f822bd7..b28bac8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml
index d5d9cfd..aafd99f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
index c2d6497..f136145 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_consistency_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_consistency_tests.xml
index dfed53f..68d1a34 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_consistency_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_consistency_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency.xml
index 6ef1022..6d15896 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency_tests.xml
index ff9ee95..182a978 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog_consistency/externalchangelog_consistency_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
index 7c288df..5686ac8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover_tests.xml
index df303a8..6de3dc2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
index ebf7dab..f595e44 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport_tests.xml
index 85cf44e..1246a0e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication.xml
index 13c9c07..1b76901 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_cleanup.xml
index 340aebd..9532344 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
index dc914e3..5830da5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
index af48f32..87a25a3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml
index ac2eb86..6cc9735 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/resynchronization/resynchronization_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml
index df068e6..3635841 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema_tests.xml
index 85cac80..c645811 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/schema/schema_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
index fc7bc85..bcacdb5 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate_tests.xml
index cd4b9b9..8609d82 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
index bea5ca0..85b6a1b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic.xml
index cdd3279..5f64f95 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic_tests.xml
index afe04a8..b43606e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/dynamic/schema_dynamic_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc.xml
index c4f7c50..1adb916 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc_tests.xml
index c9c1096..c87c42d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/rfc/schema_rfc_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema.xml
index 117a127..3367cc6 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml
index 0bed774..dca39fe 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml
index ed0cc7d..490e888 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris.xml
index 81c2a5d..4968545 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris_tests.xml
index 53a4fcb..98953d8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/solaris/schema_solaris_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/structure/schema_structure.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/structure/schema_structure.xml
index c65925c..6a663b8 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/structure/schema_structure.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/structure/schema_structure.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/structure/schema_structure_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/structure/schema_structure_tests.xml
index b1c1bf3..d439b1a 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/structure/schema_structure_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/structure/schema_structure_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_activation.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
index 50edb4e..207e4b6 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
index 8fea508..53dac10 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
index 03845c3..45f68f6 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_setup_account_activation.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
index 891edc4..796d303 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_teardown_account_activation.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml
index d5ce21b..fedb97d 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_test_account.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
index 8f7a1ab..48fa004 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
index f5d1b51..9d9c967 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
index 37396c4..bdbdfc5 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
index b2f17f8..6c3eb1f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
index 52e2425..dfd6103 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
index c7e5a49..cea286d 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
index 9331fe1..c1023a7 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
index 2f86136..3d26b8f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
index 95881ab..ea2f124 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
index 1b70cdc..73303ed 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
index a1859b9..f1fea51 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_pwd_null.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
index 4aea199..4a259a3 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
index 53c70a6..219c795 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth.xml
index febd2aa..7fe64fb 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml
index 9fa6528..165036b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_lib.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
index dcd062e..22c9596 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
index 5d7683c..7e6ebf4 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
index 380aa54..e15655b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/equal_dn_mapper.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
index 2eccdee..7b1d4c0 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
index e9c3bf4..64420ff 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_attribute_mapper.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
index aede779..3950655 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/subject_dn_mapper.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
index d67c1ae..273471e 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_custom_jks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
index ce0ca21..ec420e3 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_bob_jks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_jks.xml
index 3905ba3..e329900 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_jks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
index 68e1945..40d122ad 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_custom_jks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
index bb6805f..9bbd36e 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_setup_jks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
index d94fcf0..5fff2ff 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
index 1a23541..d109e7b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/manual_tests/README_Issue543 b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/manual_tests/README_Issue543
index fe24edc..50b4fe7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/manual_tests/README_Issue543
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/manual_tests/README_Issue543
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
index fc87781..388e96b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
index e797292..e4d1d81 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
index b16154b..ba3375e 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_setup_pkcs12.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
index 5e0532e..3c52215 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
index f2c8463..f620022 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_deprecated_schemes.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
index 6431eb8..fdbf4da 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_multiple_schemes.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
index f780772..a1a5157 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_3DES.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
index c7c40db..728f11b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_AES.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
index 7160a70..0c86daa 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BASE64.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BLOWFISH.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BLOWFISH.xml
index 6a6be4c..4f910b6 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BLOWFISH.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_BLOWFISH.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
index 12ffe5a..fd04032 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CLEAR.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
index ec1e1a0..33b2cd9 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_CRYPT.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
index 57be086..2445178 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_MD5.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
index 4014c41..8e755cd 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_RC4.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
index f428d45..7fcfd2e 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SHA.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
index 083bd21..5694f2e 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SMD5.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
index a869f67..84b26e6 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
index 9b7411a..19f695b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA256.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
index d116309..1363f36 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA384.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
index 450ceb6..4362ccb 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_SSHA512.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
index 84012a3..882ee0d 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
index 8c0d8cd..f6208e1 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_setup_pwd_storage.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
index bbc664d..ec47bbb 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_storage/security_teardown_pwd_storage.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
index 3e294d3..683e568 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_attribute_value.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
index e87ffde..97d1c8b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_character_set.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
index 682a160..2b4f863 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_dictionary.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
index efd2968..a265eb2 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_history_based.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml
index c48fca7..44fa09c 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_mult_validators.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
index 3038e8c..0186170 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_length.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
index b9bc992..5d0f9b4 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
index 77594ee..5b4bbb3 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_repeat_chars.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
index 0b1906a..4ac12c7 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_setup_pwd_validator.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
index 634b902..000a92c 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_similarity_based.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
index 612fea2..74ecdca 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_skip_val_for_admins.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
index ad552b4..36b228e 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_teardown_pwd_validator.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
index 3c43791..bc323f1 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pwd_validator/security_unique_chars.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl.xml
index fb4df11..786b2a2 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
index 27f2dbb..ed9d711 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_anon.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
index 726750a..5ab536f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_cram-md5.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
index 36bb9b4..b9aef34 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_digest-md5.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
index 2aca63d..6cf229a 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_new.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
index 8bb9fff..fd45d9e 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_sasl_plain.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
index 93e2754..22d1afb 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_setup_sasl.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
index 83490a9..dd6b71f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/sasl/security_teardown_sasl.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security.xml
index 6df83ec..b10d15b 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml
index c435517..93da2b0 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml
index 957b74a..21aa231 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
index 5b2f10c..44350ba 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
index d748092..7fb1204 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_force_pwd_change_startTLS.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
index dd12e6b..33e317f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_setup_startTLS.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_startTLS.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
index 9807633..5cd9ccf 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
index 67e8ee2..ad37b0d 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/_post.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/_post.xml
index d94c575..5cca06f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/_post.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/_post.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/_pre.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/_pre.xml
index 8f83fa2..84cd094 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/_pre.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/_pre.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
index d47bec3..adc0764 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/directory_manager.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/general_options.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/general_options.xml
index cc0fa57..2bcf0c1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/general_options.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/general_options.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
index 08d8c4a..d29ff4b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/import.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/incompatible_options.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/incompatible_options.xml
index b9d7bbd..8f1a929 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/incompatible_options.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/incompatible_options.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
index 0031122..d0514eb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/misc.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
index a7f7542..46cc408 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/ports.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
index 49dde02..5157389 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml
index d321ca2..86cf61e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/setup/setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic.xml
index 88ab8b3..ffe36b3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
index 2a66b93..a54bd43 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/basic/snmp_basic_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp.xml
index 3de2e4d..85e1893 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml
index 056966b..b296270 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
index a07963f..fd99f28 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml
index deebe91..a5f4ded 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_customconf_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_customconf_tests.xml
index 7ead9eb..d0cef14 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_customconf_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_customconf_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_defaultconf_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_defaultconf_tests.xml
index 27ed61c..dab46c7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_defaultconf_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps_defaultconf_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml
index 236931c..01ffa90 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_customconf_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_customconf_tests.xml
index fa57b8b..9ff150a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_customconf_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_customconf_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_defaultconf_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_defaultconf_tests.xml
index 3c61e90..8acce87 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_defaultconf_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1_defaultconf_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml
index 59fdb20..243c7e7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_customconf_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_customconf_tests.xml
index 4928565..2f6d7b1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_customconf_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_customconf_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_defaultconf_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_defaultconf_tests.xml
index 9d8550d..37e139f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_defaultconf_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c_defaultconf_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3.xml
index 75174ee..12c8f90 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3_customconf_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3_customconf_tests.xml
index 01deb8e..efc0655 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3_customconf_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3_customconf_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3_defaultconf_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3_defaultconf_tests.xml
index 7f1156f..7e1bbfa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3_defaultconf_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/v3/snmp_v3_defaultconf_tests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
index 35ddca3..2c521d3 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
index d748297..46d8083 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
index 3dab9b8..61f682a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
index 7ffd549..dfbc289 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
index 4312f97..1ca0403 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
index 8074e80..6d48aaa 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml
index 30ad0c2..61a9a32 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
index 6fc0e9d..8fcccc7 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! See the License for the specific language governing permissions
  ! and limitations under the License.
  !
- ! When distributing Covered Code, exclude this CDDL HEADER in each
- ! file and exclude 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:
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml
index f00ba27..da5ba49 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
index 6155740..57a5e47 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
index b43a719..e7eff15 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
index e04f9d3..4ff73e3 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml
index 163ae42..4911ac3 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.xml
@@ -6,17 +6,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/dependencies.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/dependencies.xml
index a042b01..1837697 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/dependencies.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/dependencies.xml
@@ -6,17 +6,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/opends.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/opends.xml
index 5251577..5dc46f0 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/opends.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/opends.xml
@@ -6,17 +6,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/proxy.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/proxy.xml
index 5c92cd1..8a428dc 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/proxy.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/proxy.xml
@@ -6,17 +6,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/staf.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/staf.xml
index d572a93..67c5df0 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/staf.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/staf.xml
@@ -6,17 +6,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml
index 16eb5b7..2c18074 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/tests.xml
@@ -6,17 +6,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/usage.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/usage.xml
index 7d6491d..a13c069 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/usage.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/usage.xml
@@ -6,17 +6,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/user.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/user.xml
index b2fc92c..343441e 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/user.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/user.xml
@@ -6,17 +6,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/dsml/resource/errorStrings.properties b/opendj-sdk/opends/tests/staf-tests/shared/dsml/resource/errorStrings.properties
index 318c400..9bb343e 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/dsml/resource/errorStrings.properties
+++ b/opendj-sdk/opends/tests/staf-tests/shared/dsml/resource/errorStrings.properties
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/DSMLService.java b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/DSMLService.java
index 739bb58..f39b985 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/DSMLService.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/DSMLService.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/Checker.java b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/Checker.java
index 76125e0..7851526 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/Checker.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/Checker.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/proctor/resource/legal-notices/Proctor.LICENSE
- * or https://proctor.dev.java.net/Proctor.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/DsmlAttrCompare.java b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/DsmlAttrCompare.java
index 89026ea..4f7270f 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/DsmlAttrCompare.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/DsmlAttrCompare.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/proctor/resource/legal-notices/Proctor.LICENSE
- * or https://proctor.dev.java.net/Proctor.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/JAXBCheckerException.java b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/JAXBCheckerException.java
index d0aaf33..334bf81 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/JAXBCheckerException.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/JAXBCheckerException.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/proctor/resource/legal-notices/Proctor.LICENSE
- * or https://proctor.dev.java.net/Proctor.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/LDAPResultCode.java b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/LDAPResultCode.java
index b8c38fd..6455877 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/LDAPResultCode.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/LDAPResultCode.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/ResponseChecker.java b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/ResponseChecker.java
index 1eb18c1..cabf72d 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/ResponseChecker.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/dsml/src/com/ibm/staf/service/opends/tester/ResponseChecker.java
@@ -6,17 +6,16 @@
  * (the "License").  You may not use this file except in compliance
  * with the License.
  *
- * You can obtain a copy of the license at
- * trunk/proctor/resource/legal-notices/Proctor.LICENSE
- * or https://proctor.dev.java.net/Proctor.LICENSE.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/baselib.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/baselib.xml
index 5dcd55e..174ba3f 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/baselib.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/baselib.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
index b6f7e5b..e568324 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml
index d97d773..99ca23d 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
index 57cc419..d767da8 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/ldap.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/ldap.xml
index 6cca0e2..2f23eff 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/ldap.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/ldap.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/sdk.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/sdk.xml
index 0a3936a..d99c102 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/sdk.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/sdk.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
index 1331cf2..08babd8 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/signals.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/signals.xml
index e9ac01e..5e00d14 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/signals.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/signals.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
index 951cb85..73451bb 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/stafcmd.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/stafcmd.xml
index ccaaac9..f15b822 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/stafcmd.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/stafcmd.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/staxcmd.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/staxcmd.xml
index f8a866a..ff58786 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/staxcmd.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/staxcmd.xml
@@ -8,17 +8,16 @@
   ! (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.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! 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:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
index 5a945ab..39b80e9 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
index a131c5e..9e5a67d 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml
index fe16c86..a0a0118 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/webcontainer.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/webcontainer.xml
index 9b34814..055a67b 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/webcontainer.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/webcontainer.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/CSN.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/CSN.java
index 97b412d..fa306a3 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/CSN.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/CSN.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Change.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Change.java
index dee13aa..4cf1916 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Change.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Change.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/EclReadAndPlay.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/EclReadAndPlay.java
index b1b2ce0..496d85d 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/EclReadAndPlay.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/EclReadAndPlay.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/ImprovedLDAPConnection.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/ImprovedLDAPConnection.java
index 5932d52..9244fcc 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/ImprovedLDAPConnection.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/ImprovedLDAPConnection.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/LDIF.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/LDIF.java
index 975a385..77f61ac 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/LDIF.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/LDIF.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearch.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearch.java
index 3636639..ada8978 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearch.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearch.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java
index 12cf44c..affb7e7 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Reader.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Reader.java
index a23a04b..52ef77b 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Reader.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Reader.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Server.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Server.java
index fc34c3c..8d5f2c7 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Server.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Server.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Writer.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Writer.java
index 98ac871..76621f8 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Writer.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/Writer.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/addAnEntry.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/addAnEntry.java
index 7c8802b..404eb9a 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/addAnEntry.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/addAnEntry.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/modifyAnAttribute.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/modifyAnAttribute.java
index df4f050..845d95b 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/modifyAnAttribute.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/modifyAnAttribute.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/modifyDn.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/modifyDn.java
index 3078615..0acfeb5 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/modifyDn.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/modifyDn.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/saslSearchClient.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/saslSearchClient.java
index 2846360..4b81d22 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/saslSearchClient.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjndi/saslSearchClient.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/ArrayData.java b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/ArrayData.java
index a99b95f..781db34 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/ArrayData.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/ArrayData.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
index dc65a56..af89791 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/ParseData.java b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/ParseData.java
index 50c02e0..0734b29 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/ParseData.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/ParseData.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/README b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/README
index 029526f..024f2ad 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/README
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/README
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/TestFileList.java b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/TestFileList.java
index 5b9e886..9227258 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/TestFileList.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/TestFileList.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java
index ddaf7fb..9e3d2df 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_int.java b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_int.java
index 9083c43..64e949e 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_int.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_int.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_xml.java b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_xml.java
index 39d6564..2c57518 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_xml.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/parsingtool/WriteXMLFile_xml.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPGet.java b/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPGet.java
index 893d0d7..7ab2309 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPGet.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPGet.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPSet.java b/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPSet.java
index 4fac0d4..57ec7e1 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPSet.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPSet.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPTrapListener.java b/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPTrapListener.java
index 124542e..dcb2431 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPTrapListener.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/snmp/SNMPTrapListener.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/xmlToHtml/xmlToHtml.java b/opendj-sdk/opends/tests/staf-tests/shared/java/xmlToHtml/xmlToHtml.java
index 542446f..edca3bb 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/xmlToHtml/xmlToHtml.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/xmlToHtml/xmlToHtml.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/python/common.py b/opendj-sdk/opends/tests/staf-tests/shared/python/common.py
index 8efe129..9d9249e 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/python/common.py
+++ b/opendj-sdk/opends/tests/staf-tests/shared/python/common.py
@@ -7,16 +7,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/python/objects.py b/opendj-sdk/opends/tests/staf-tests/shared/python/objects.py
index 8cbdd0e..1162336 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/python/objects.py
+++ b/opendj-sdk/opends/tests/staf-tests/shared/python/objects.py
@@ -6,18 +6,17 @@
 # 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/CDDLv1_0.txt
+#
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
 # or http://forgerock.org/license/CDDLv1.0.html.
 # 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/CDDLv1_0.txt.  If applicable,
-# add the following below this CDDL HEADER, with the fields enclosed
-# by brackets "[]" replaced with your own identifying information:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/python/replication.py b/opendj-sdk/opends/tests/staf-tests/shared/python/replication.py
index 2a0fb7c..64a72a2 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/python/replication.py
+++ b/opendj-sdk/opends/tests/staf-tests/shared/python/replication.py
@@ -7,16 +7,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/python/schema.py b/opendj-sdk/opends/tests/staf-tests/shared/python/schema.py
index ce017ed..3c945bd 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/python/schema.py
+++ b/opendj-sdk/opends/tests/staf-tests/shared/python/schema.py
@@ -7,16 +7,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/python/security.py b/opendj-sdk/opends/tests/staf-tests/shared/python/security.py
index dad22a9..68bcd54 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/python/security.py
+++ b/opendj-sdk/opends/tests/staf-tests/shared/python/security.py
@@ -7,16 +7,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/python/snmp.py b/opendj-sdk/opends/tests/staf-tests/shared/python/snmp.py
index 60bfc6f..fce429c 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/python/snmp.py
+++ b/opendj-sdk/opends/tests/staf-tests/shared/python/snmp.py
@@ -7,16 +7,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/staf/staf-controller.cfg b/opendj-sdk/opends/tests/staf-tests/shared/staf/staf-controller.cfg
index 38fc79f..dda9c1d 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/staf/staf-controller.cfg
+++ b/opendj-sdk/opends/tests/staf-tests/shared/staf/staf-controller.cfg
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/staf/staf-slave.cfg b/opendj-sdk/opends/tests/staf-tests/shared/staf/staf-slave.cfg
index 358888a..d7f1205 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/staf/staf-slave.cfg
+++ b/opendj-sdk/opends/tests/staf-tests/shared/staf/staf-slave.cfg
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/stax.dtd b/opendj-sdk/opends/tests/staf-tests/shared/stax.dtd
index 0ea3208..31c3bdb 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/stax.dtd
+++ b/opendj-sdk/opends/tests/staf-tests/shared/stax.dtd
@@ -6,17 +6,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs b/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
index cf74b93..cd13c56 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml
index 51ad740..c09a0b6 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml
index 96d9609..f6620b3 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTests.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/topology/3server_topology.txt b/opendj-sdk/opends/tests/staf-tests/shared/topology/3server_topology.txt
index 2226df4..bc2c6c8 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/topology/3server_topology.txt
+++ b/opendj-sdk/opends/tests/staf-tests/shared/topology/3server_topology.txt
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/topology/basic_topology.txt b/opendj-sdk/opends/tests/staf-tests/shared/topology/basic_topology.txt
index a50ffdc..d30a6a8 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/topology/basic_topology.txt
+++ b/opendj-sdk/opends/tests/staf-tests/shared/topology/basic_topology.txt
@@ -5,16 +5,15 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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]
 #
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
index 05b4f84..f4b35bb 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-logs.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-logs.xsl
index 6815009..6875d7f 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-logs.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-logs.xsl
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl
index 3ac9890..91ba9b9 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-suites-report.xsl
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl
index 683de13..2b401c9 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/gen-tests-report.xsl
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/id.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/id.xsl
index 404b86f..0d7a5b9 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/id.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/id.xsl
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/junit-report.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/junit-report.xsl
index 690aa02..b2aacd6 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/junit-report.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/junit-report.xsl
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/merge_results.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/merge_results.xsl
index c14a1da..4ec0ff2 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/merge_results.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/merge_results.xsl
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/testspec-index-stylesheet.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/testspec-index-stylesheet.xsl
index 494b01d..47f3075 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/testspec-index-stylesheet.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/testspec-index-stylesheet.xsl
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/xsl/testspec-stylesheet.xsl b/opendj-sdk/opends/tests/staf-tests/shared/xsl/testspec-stylesheet.xsl
index c513334..8cc7cc9 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/xsl/testspec-stylesheet.xsl
+++ b/opendj-sdk/opends/tests/staf-tests/shared/xsl/testspec-stylesheet.xsl
@@ -9,17 +9,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/import_ldif/import_ldif_start.ldif b/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/import_ldif/import_ldif_start.ldif
index a99f8e2..40f7c58 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/import_ldif/import_ldif_start.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/import_ldif/import_ldif_start.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/importldif/importldif_start.ldif b/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/importldif/importldif_start.ldif
index a99f8e2..40f7c58 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/importldif/importldif_start.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/importldif/importldif_start.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/quickstart/quickstart.ldif b/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/quickstart/quickstart.ldif
index 87de96e..d628878 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/quickstart/quickstart.ldif
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/shared/data/quickstart/quickstart.ldif
@@ -5,17 +5,16 @@
 # (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.
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+# or http://forgerock.org/license/CDDLv1.0.html.
 # 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:
+# file and include the License file at legal-notices/CDDLv1_0.txt.
+# 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif.xml
index 7cc9d2c..9a678b3 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml
index 417e71a..7db63cd 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml
index 10b1ce5..ba01633 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_10m.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_6m.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_6m.xml
index cb85e9b..9d7faae 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_6m.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_bin_attr_6m.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_cleanup.xml
index 7358766..224ab68 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_cleanup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml
index aecf7d2..d3bea8e 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_large_import_buffer.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml
index f19299b..b0cc918 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_low_index_entry_limit.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml
index b9afbcc..ba44343 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_indexes.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml
index 4f5d816..e607aab 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_many_thrds.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml
index dadc1e2..8c5f85f 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_out-of-box.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml
index 215143d..a0b3f12 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_setup.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml
index dd270ac..e30f728 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml
index d51e04a..3e819eb 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/import_ldif/import_ldif_tasks_bin_attr_with_load.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/basic/importldif_basic.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/basic/importldif_basic.xml
index bc0822c..2532885 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/basic/importldif_basic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/basic/importldif_basic.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/basic/importldif_basic_tests.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/basic/importldif_basic_tests.xml
index 2eeb87f..3d78c89 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/basic/importldif_basic_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/basic/importldif_basic_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/binary_attributes/importldif_binary_attributes.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/binary_attributes/importldif_binary_attributes.xml
index 6d72479..cfab8ac 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/binary_attributes/importldif_binary_attributes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/binary_attributes/importldif_binary_attributes.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/binary_attributes/importldif_binary_attributes_tests.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/binary_attributes/importldif_binary_attributes_tests.xml
index 5064327..4bb6d73 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/binary_attributes/importldif_binary_attributes_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/binary_attributes/importldif_binary_attributes_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/importldif.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/importldif.xml
index 4ada5c6..ccb75ba 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/importldif.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/importldif.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes.xml
index 501f4bc..d32a641 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes_tests.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes_tests.xml
index 19a4608..9b7fb21 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/indexes/importldif_indexes_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/properties/importldif_properties.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/properties/importldif_properties.xml
index 3ae91da..92306eb 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/properties/importldif_properties.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/properties/importldif_properties.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/properties/importldif_properties_tests.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/properties/importldif_properties_tests.xml
index 922d94b..cf827b6 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/properties/importldif_properties_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/properties/importldif_properties_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks.xml
index affb45d..e0d4c4d 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks_tests.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks_tests.xml
index cc25019..7c25a4e 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/importldif/tasks/importldif_tasks_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml
index 260aa9b..299eea8 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic_tests.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic_tests.xml
index d1f214a..849f874 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/operations.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/operations.xml
index a171942..ad9f2c7 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/operations.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/operations/operations.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/quickstart/quickstart.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/quickstart/quickstart.xml
index 0697475..ad5d7ab 100755
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/quickstart/quickstart.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/quickstart/quickstart.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication.xml
index 6181d78..ae53f19 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_del_add_del_multiple.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_del_add_del_multiple.xml
index 9c093c2..bf59612 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_del_add_del_multiple.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_del_add_del_multiple.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete.xml
index a2daa18..d6d850f 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete_multiple.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete_multiple.xml
index 15de8bc..199cf27 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete_multiple.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete_multiple.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete.xml
index 1050d71..e978d6d 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete_search.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete_search.xml
index d6c3834..686c579 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete_search.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete_search.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_modify_multiple.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_modify_multiple.xml
index a73cef3..da52766 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_modify_multiple.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_modify_multiple.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_search_multiple.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_search_multiple.xml
index 3e46fc8..8aa5146 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_search_multiple.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_search_multiple.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify.xml
index ed90129..25cd99c 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_modifyrdn_multiple.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_modifyrdn_multiple.xml
index b28c9eb..558435f 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_modifyrdn_multiple.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_modifyrdn_multiple.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_multiple.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_multiple.xml
index b7aa5ea..ce2ea97 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_multiple.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_multiple.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn.xml
index a84b4ed..1dd5ed2 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn_multiple.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn_multiple.xml
index 4dc16ce..3fb1b35 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn_multiple.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn_multiple.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_search.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_search.xml
index 5cca1c8..95464a6 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_search.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication/replication_search.xml
@@ -8,17 +8,16 @@
  ! (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.
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/basic/replication_operations_basic.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/basic/replication_operations_basic.xml
index 342baff..948b897 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/basic/replication_operations_basic.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/basic/replication_operations_basic.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/basic/replication_operations_basic_tests.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/basic/replication_operations_basic_tests.xml
index 375efa9..1f03745 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/basic/replication_operations_basic_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/basic/replication_operations_basic_tests.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/replication_operations.xml b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/replication_operations.xml
index c025d1c..7c381bf 100644
--- a/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/replication_operations.xml
+++ b/opendj-sdk/opends/tests/staf-tests/stress-tests/testcases/replication_operations/replication_operations.xml
@@ -7,18 +7,17 @@
  ! 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/CDDLv1_0.txt
+ !
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  ! or http://forgerock.org/license/CDDLv1.0.html.
  ! 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/CDDLv1_0.txt.  If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
+ ! file and include the License file at legal-notices/CDDLv1_0.txt.
+ ! 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/CategoryTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/CategoryTest.java
index 18b0f7f..e7ef8cb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/CategoryTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/CategoryTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageBuilderTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageBuilderTest.java
index 9eaeec6..2cb7737 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageBuilderTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageBuilderTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java
index 4bbd8f6..844b862 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageDescriptorRegistryTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageTest.java
index 6996050..7ec0bb7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessageTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessagesTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessagesTestCase.java
index bc38bf9..4448e9f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessagesTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/MessagesTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/PropertiesFilesTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/PropertiesFilesTest.java
index cc88400..8992408 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/PropertiesFilesTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/PropertiesFilesTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/SeverityTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/SeverityTest.java
index 62f1928..b40fdbb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/SeverityTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/messages/SeverityTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/ConfigurationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/ConfigurationTest.java
index e326762..59bf548 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/ConfigurationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/ConfigurationTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java
index 3da9124..3950c09 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/InstallationTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/QuickSetupTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/QuickSetupTestCase.java
index 25a4b4d..793467b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/QuickSetupTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/QuickSetupTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java
index 12b01de..eccbae6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/TestUtilities.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java
index 79824bd..2c513ac 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/FileManagerTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/ServerControllerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/ServerControllerTest.java
index e918f34..f9cf0f3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/ServerControllerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/ServerControllerTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/UtilsTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/UtilsTest.java
index d392a14..982b83a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/UtilsTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/quicksetup/util/UtilsTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java
index ccc1159..e3bfc3e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/DirectoryServerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java
index ec4cb51..8fadf80 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/MemoryReductionTestCases.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
index 67fe804..9efeafb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/SuiteRunner.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
index 08587de..5514ab7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestCaseUtils.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
index 0cdfe18..24b44c0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestListener.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestTextWriter.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestTextWriter.java
index 9662590..f7df151 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestTextWriter.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/TestTextWriter.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java
index 1942c6a..792b016 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AbstractManagedObjectDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AdminTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AdminTestCase.java
index 038a862..546f9d4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AdminTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AdminTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AggregationPropertyDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AggregationPropertyDefinitionTest.java
index ba5a809..30d2e59 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AggregationPropertyDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AggregationPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
index 712164a..5dff39c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/AttributeTypePropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/BooleanPropertyDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/BooleanPropertyDefinitionTest.java
index 5aec978..32a72ad 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/BooleanPropertyDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/BooleanPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java
index a55d452..88785de 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ClassPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DNPropertyDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DNPropertyDefinitionTest.java
index e82a3d4..06cdd30 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DNPropertyDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DNPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java
index a9a9c3b..f4ee3bc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationUnitTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationUnitTest.java
index 38a80ad..77c5b25 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationUnitTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/DurationUnitTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java
index 9db1e56..6498dc9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/EnumPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/IntegerPropertyDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/IntegerPropertyDefinitionTest.java
index 3de5e1a..ca9f05b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/IntegerPropertyDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/IntegerPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/LDAPProfileTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/LDAPProfileTest.java
index 2338fb4..e1065e3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/LDAPProfileTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/LDAPProfileTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
index 395d815..d2d9a15 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectDefinitionI18NResourceTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java
index 5e92161..ef9447b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ManagedObjectPathTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
index 3d41520..bc51efc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
index 2c91c71..b0a301a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/RelativeInheritedDefaultBehaviorProviderTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/SizePropertyDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/SizePropertyDefinitionTest.java
index 2e38645..41f33f8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/SizePropertyDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/SizePropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/SizeUnitTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/SizeUnitTest.java
index af5573d..20f803c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/SizeUnitTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/SizeUnitTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/StringPropertyDefinitionTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/StringPropertyDefinitionTest.java
index 004c2f1..de96ddf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/StringPropertyDefinitionTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/StringPropertyDefinitionTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java
index e9b8b14..f7f8004 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfg.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfg.java
index acab994..489ca7b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfg.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfg.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgClient.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgClient.java
index d31cb8d..6c3d56a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgClient.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgClient.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.java
index 19be851..5532fb0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildCfgDefn.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildConfiguration.xml b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildConfiguration.xml
index 734cd32..89a45d9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildConfiguration.xml
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestChildConfiguration.xml
@@ -7,17 +7,16 @@
   ! (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.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! 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:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfg.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfg.java
index 47a6c67..cc881e0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfg.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfg.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgClient.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgClient.java
index 35f08ad..b4e0405 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgClient.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgClient.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.java
index 26a8724..c85f2d5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentCfgDefn.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml
index 8192db2..8e010e8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestParentConfiguration.xml
@@ -7,17 +7,16 @@
   ! (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.
+  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+  ! or http://forgerock.org/license/CDDLv1.0.html.
   ! 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:
+  ! file and include the License file at legal-notices/CDDLv1_0.txt.
+  ! 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestTopCfgDefnTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestTopCfgDefnTest.java
index 4f4147f..e5966d5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestTopCfgDefnTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestTopCfgDefnTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ValidateConfigDefinitionsTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ValidateConfigDefinitionsTest.java
index 8067ebd..ba0438f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ValidateConfigDefinitionsTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/ValidateConfigDefinitionsTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java
index 6e4ae2a..0e1db51 100755
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/CliTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java
index 5f781d7..7a3fd4f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/cli/DsframeworkTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/AggregationClientTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/AggregationClientTest.java
index 350e5ac..88bf9d0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/AggregationClientTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/AggregationClientTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
index dd9d82f..2d94df6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/CreateEntryMockLDAPConnection.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
index 22c613f..335d98b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/DeleteSubtreeMockLDAPConnection.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/LDAPClientTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/LDAPClientTest.java
index 1ec2d37..36a0f3d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/LDAPClientTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/LDAPClientTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockConstraint.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockConstraint.java
index cf8dc38..b1d8cc6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockConstraint.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockConstraint.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java
index 2fba588..3afce2c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/MockLDAPConnection.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
index fbed592..22754a4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/ldap/ModifyEntryMockLDAPConnection.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java
index 59cd5bf..a375585 100755
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/client/spi/PropertySetTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java
index 7b8b6bd..1c9711a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AdminTestCaseUtils.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
index 786acb2..e63c26e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationServerTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
index f4349eb..c49c6f9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ConstraintTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java
index 51aa6e8..1942fff 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DNBuilderTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
index 7fb3b6f..f6ad083 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java
index 476b419..3d9888d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/ListenerTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java
index 7360c76..c4db668 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/MockConstraint.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java
index 306f696..f324c78 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/APITestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java
index fbad968..ff51e85 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AlertHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java
index 7fcdece..d5654e4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/AuthenticationPolicyTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java
index d8694f6..9cbac5c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/ConfigChangeListenerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/DITCacheMapTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/DITCacheMapTestCase.java
index 74832b6..3f61e69 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/DITCacheMapTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/DITCacheMapTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
index 79126b2..b8cdb61 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/PasswordValidatorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/TestTaskListener.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/TestTaskListener.java
index 8808dc0..b7ef0d7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/TestTaskListener.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/TestTaskListener.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
index 271e8c4..9ab5375 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/DirectoryServerPluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java
index a283f0c..f3c0dd8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/api/plugin/PluginAPITestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciBodyTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciBodyTest.java
index ae9b23f..d65e095 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciBodyTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciBodyTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java
index ef8b7fa..a756b0e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java
index 3d475d2..70b8a3e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AciTests.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java
index 04b30dc..4aadfca 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/AlternateRootDN.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/DNSTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/DNSTestCase.java
index 78edb5d..b8c1978 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/DNSTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/DNSTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/EnumRightTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/EnumRightTest.java
index 2294797..3a77056 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/EnumRightTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/EnumRightTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
index 8d02198..71d0119 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ExtOpTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
index 16b3f0e..6efa17f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/GetEffectiveRightsTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/IPTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/IPTestCase.java
index 9c78ee1..581c323 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/IPTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/IPTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
index 8707b28..c13df85 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/NestedGroupDNTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
index e7aa4f5..1168a72 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ProxyBindTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
index a8d4103..7dfc7c1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/ReferencesTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/SSFTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/SSFTestCase.java
index 4e04eaa..3a12208 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/SSFTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/SSFTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java
index fcfd27d..58222a3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargAttrFiltersTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
index 794e600..65bfb55 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetAttrTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
index cc5a676..db79c4b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetControlTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java
index dc27ca1..a843dcd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/authorization/dseecompat/TargetTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java
index 707849e..7eedefc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/BackendTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java
index c9b5752..a775a76 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/GenericBackendTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
index 5f8f309..3aa56ff 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/LDIFBackendTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
index fd4c992..2eec19b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaBackendTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
index 3cf0393..0c594b1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/SchemaTestMatchingRule.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
index 1b5e041..5d284c3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/JebTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
index 5c0c90d..70ad008 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java
index 3714b49..b8cabf6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEntryContainer.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java
index 82d5273..64cb528 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestEnvManager.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
index a1afb4a..d4f10d1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestImportJob.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
index 2cca357..61b19d6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestJebFormat.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
index 16a126b..f08e92a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestRebuildJob.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
index 053b3c1..28d4ba3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVLVIndex.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
index 41be068..a1f84a2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/jeb/TestVerifyJob.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
index 9e72d85..cc95e13 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/backends/task/TaskBackendTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java
index da9d7ef..24307ef 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ControlsTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java
index 4f554cb..00cca02 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ExternalChangelogControlTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
index fa286a7..f90ae5a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/MatchedValuesControlTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java
index cae98e3..a1f74ae 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordControlTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
index a6a4e5f..b2254d0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PasswordPolicyControlTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
index d618083..966a2c2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/PersistentSearchControlTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
index 06ffef2..f8469f3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV1ControlTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
index 58d85b9..dba65d7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ProxiedAuthV2ControlTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
index bdb8c7f..60e5beb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/ServerSideSortControlTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
index f082910..b408bfb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/controls/VLVControlTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
index 1a8a72a..05af03f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AbandonOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
index ce2cd45..02d23b9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/AddOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
index 015e4f0..f91f8c6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BackendConfigManagerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
index ea1891d..0539ced 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/BindOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
index aa3ef8b..0bca236 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CompareOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java
index 1c435ee..3f9a4f5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/CoreTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
index 12773e3..55c9167 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/DeleteOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
index bc61aec..d14dd2f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/GroupManagerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
index 5c0e70c..0a7721f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/IdleTimeLimitTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
index 280f13e..58e9786 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java
index e521075..07d6bed 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/OperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java
index fd60c51..08ef0c1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PasswordPolicyTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PluginConfigManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PluginConfigManagerTestCase.java
index a285f65..c691139 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PluginConfigManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/PluginConfigManagerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
index 4a3d6bc..e6101e1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/RejectUnauthReqTests.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
index 3df8e7d..88b16d3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SearchOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java
index 8dad866..af11d21 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryManagerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java
index d9d5e40..a5c9cbb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubentryPasswordPolicyTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java
index fbb7b06..171108a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/SubtreeSpecificationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java
index 6bef9c5..3d0a33b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestChangeNotificationListener.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
index 6339981..0205e1c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/TestModifyDNOperation.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java
index 8d642c7..dd1050f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/UnbindOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
index f8ea07d..3224fd1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowConfigurationTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java
index e8b49f0..7a3fcff 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/WorkflowTopologyTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ANDConnectionCriteriaTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ANDConnectionCriteriaTest.java
index aa48391..4e527df 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ANDConnectionCriteriaTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ANDConnectionCriteriaTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/AuthMethodConnectionCriteriaTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/AuthMethodConnectionCriteriaTest.java
index 501439c..0707e54 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/AuthMethodConnectionCriteriaTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/AuthMethodConnectionCriteriaTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/BindDNConnectionCriteriaTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/BindDNConnectionCriteriaTest.java
index b8b0afa..6736d5e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/BindDNConnectionCriteriaTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/BindDNConnectionCriteriaTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/IPConnectionCriteriaTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/IPConnectionCriteriaTest.java
index 0cd08c0..1832052 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/IPConnectionCriteriaTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/IPConnectionCriteriaTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockClientConnection.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockClientConnection.java
index a7ab2a4..19248b2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockClientConnection.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockClientConnection.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockRequestFilteringQOSPolicyCfg.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockRequestFilteringQOSPolicyCfg.java
index ea5f73b..effab78 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockRequestFilteringQOSPolicyCfg.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockRequestFilteringQOSPolicyCfg.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockResourceLimitsQOSPolicyCfg.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockResourceLimitsQOSPolicyCfg.java
index 3633350..94eb560 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockResourceLimitsQOSPolicyCfg.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/MockResourceLimitsQOSPolicyCfg.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
index a99b743..5087077 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/NetworkGroupTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
index 3a2b674..d661863 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/RequestFilteringPolicyTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyTest.java
index 9b9cfd5..1620c23 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/ResourceLimitsPolicyTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/SecurityConnectionCriteriaTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/SecurityConnectionCriteriaTest.java
index 6525955..3776f9d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/SecurityConnectionCriteriaTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/networkgroups/SecurityConnectionCriteriaTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
index e98c58f..0e7c8d0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoManagerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoTestCase.java
index 9a52d03..843c826 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/CryptoTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
index 28867fa..58091bf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/crypto/GetSymmetricKeyExtendedOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
index 212d1b0..d7aa6ef 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AESPasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
index 1555632..3def652 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AnonymousSASLMechanismHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
index 9129400..7c7534a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/AttributeValuePasswordValidatorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
index 71c18fa..85998b0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/Base64PasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
index d088ef4..e8607c1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlindTrustManagerProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
index f63b418..a255e88 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/BlowfishPasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
index 4da4895..89edda4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CRAMMD5SASLMechanismHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
index e432bff..73f256e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CancelExtendedOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
index 526ecb5..f2cf53f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CertificateValidationPolicyTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
index 446bc5c..7c9c92d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CharacterSetPasswordValidatorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
index deb9188..5ad373f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ClearPasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java
index 168cc48..f3ebda3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CommonEntryCacheTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java
index 6c54fc4..53d17c5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ConfigFileHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
index 614b718..8785c8b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/CryptPasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
index 1c99632..a67690b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DefaultEntryCacheTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
index 1d3b6cd..8d26f9a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DictionaryPasswordValidatorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
index 0022568..5261ed3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DigestMD5SASLMechanismHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java
index a942fa9..51f1798 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/DummyAlertHandler.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
index 2850a5b..139781a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntityTagVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
index a8bd6c9..f2bd49c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryDNVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
index 2bc21fa..3f748ca 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/EntryUUIDVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
index 4345088..7ef33f1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ErrorLogAccountStatusNotificationHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
index a37d730..b212001 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExactMatchIdentityMapperTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java
index 0c583fe..e602b81 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionTestUtils.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java
index 22760d7..aaaf450 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExtensionsTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
index c4911a7..0786c2d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/ExternalSASLMechanismHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java
index b6f94c1..e0d2a09 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FIFOEntryCacheTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
index 37c1276..dc9ead8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedKeyManagerProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
index 94d070e..fc4a478 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileBasedTrustManagerProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
index 1c23cfb..6d8b88a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FileSystemEntryCacheTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
index 8102d74..64dcc5e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/FingerprintCertificateMapperTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
index 00e864c..e4be8dd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/GoverningStructureRuleVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
index 84b60c5..63e3d64 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/HasSubordinatesVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
index 85a6fe1..9d482b8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/IsMemberOfVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java
index 31e0d45..79ac352 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/JMXAlertHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
index 51bc2e5..b4b9f62 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
index 69ef613..10519c0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/LengthBasedPasswordValidatorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
index 8a25bc1..5d65e7c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/MD5PasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
index 5dd4939..aad4429 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullKeyManagerProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
index e33c38b..f6af0cc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NullTrustManagerProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
index 88ff9df..6e2c7ad 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/NumSubordinatesVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
index f813dac..9db0328 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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/CDDLv1_0.txt
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
index 425f171..cb8858a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordModifyExtendedOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
index 6a605b7..3c0d5fd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
index 945be58..c3adb1d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PlainSASLMechanismHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java
index 03a1aa6..a03ee52 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/PreloadEntryCacheTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
index 855313a..ec03044 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RC4PasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
index c08a047..4824495 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RandomPasswordGeneratorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
index 50c3300..8581df4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RegularExpressionIdentityMapperTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
index cedad0f..0be043f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/RepeatedCharactersPasswordValidatorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SASLOverTLSTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SASLOverTLSTestCase.java
index 39666e9..83e207b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SASLOverTLSTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SASLOverTLSTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
index 32e150b..02b74c0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SHA1PasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
index c48aca6..2886ecf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
index e7b79dd..0757117 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
index 4123621..3760cbd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
index ca63cc9..162a1e8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
index 4d58e67..7e909f8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
index acb1f5d..fe708a1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SimilarityBasedPasswordValidatorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
index c94b143..ebe7dc9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SoftReferenceEntryCacheTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
index 4e88aba..13524ab 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StartTLSExtendedOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
index 482a249..bb20ff6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/StructuralObjectClassVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
index ad2f939..011c5e4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectAttributeToUserAttributeCertificateMapperTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
index 4186d16..c98f881 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubjectDNToUserAttributeCertificateMapperTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
index ae4a511..0b746aa 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/SubschemaSubentryVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TLSByteChannelTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TLSByteChannelTestCase.java
index 6cf61a2..13108d3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TLSByteChannelTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TLSByteChannelTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAccountStatusNotificationHandler.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
index b08f28f..4fafee0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAccountStatusNotificationHandler.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java
index 44d20ab..b170b7e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestAlertGenerator.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java
index a084d01..4940704 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TestPasswordValidator.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
index f83e151..7dd7d6d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TraditionalWorkQueueTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
index 21752c9..3673df9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/TripleDESPasswordStorageSchemeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
index af57419..77996a0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UniqueCharactersPasswordValidatorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
index 78b93bc..7f91c4d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
index f0a4bc0..7997082 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
index 292e5a9..b6cbd22 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/WhoAmIExtendedOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java
index 69d1f02..5832def 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/loggers/AbstractTextAccessLogPublisherTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java
index 7351a11..ac1e262 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/DatabaseEnvironmentMonitorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java
index 94e39c6..f87859a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/GenericMonitorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
index b65c767..7c3efc6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java
index 27a0796..5ccdfc2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/MonitorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java
index 55c437d..8aea9cc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/StackTraceMonitorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java
index ffbe4f9..453d23d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/SystemInfoMonitorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java
index 90d8e59..9ff9bff 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TestMonitorProvider.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
index ce249d2..d897244 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/TraditionalWorkQueueMonitorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java
index b3ff748..feb60c2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/monitors/VersionMonitorTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
index 51f75e6..31ec3f5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/AttributeCleanupPluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java
index 231f2c0..df42a97 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DelayPreOpPlugin.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
index 72f6787..bcc2760 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/DisconnectClientPlugin.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
index 99c544a..9efafa0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java
index 898c8e2..97dc00e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/InvocationCounterPlugin.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
index dde90d9..f321c8b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LDAPADListPluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
index 5083148..239f11d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/LastModPluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java
index 4a178a1..9037a0d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/NullPlugin.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
index 33042df..fd28a5e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PasswordPolicyImportPluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java
index f57588b..d145886 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/PluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
index 868c7ae..cad144e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ReferentialIntegrityPluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java
index 0558f70..902c288 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/SambaPasswordPluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
index e3ee393..dc705d7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/SevenBitCleanPluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java
index c6276e5..44e0227 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/ShortCircuitPlugin.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java
index 8a186a7..c2775fc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UniqueAttributePluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java
index c879c50..2822703 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/UpdatePreOpPlugin.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
index 59e56f1..1f8b141 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/LDIFConnectionHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReaderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReaderTestCase.java
index 2a71075..48cc414 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReaderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteChannelReaderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReaderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReaderTestCase.java
index 85da533..2cb7a6a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReaderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ByteSequenceReaderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReaderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReaderTestCase.java
index b0a44b9..4ead8e2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReaderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReaderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriterTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriterTestCase.java
index f3f1642..246aadd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriterTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriterTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ReaderTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ReaderTestCase.java
index 336afc5..4152253 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ReaderTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1ReaderTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1WriterTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1WriterTestCase.java
index 0e60798..26e4d87 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1WriterTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/asn1/ASN1WriterTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilterTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilterTest.java
index 4a40807..2e39a10 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilterTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilterTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
index eaba9c2..53d8b63 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalClientConnectionTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
index ef159a1..ba3aaa0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalConnectionHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
index 916dbdd..557d573 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalLDAPSocketTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
index db9f3fe..0785481 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalSearchOperationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java
index c3cce87..e463227 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/InternalTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java
index b504ca7..9d1c7b5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/internal/TestInternalSearchListener.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
index fc47267..b02b88f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
index f541c5c..bf69d60 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxPrivilegeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java
index b49e79d..2bfd86a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
index a3e0c11..c9d1e2d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/PostConnectedDisconnectTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
index efc3588..5a6a2e1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPBinaryOptionTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
index 67d4b22..49bb4b3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LDAPv2TestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java
index 5bda047..0f288db 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/LdapTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
index e91282a..78ad388 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAbandonRequestProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
index d45ef97..3f2ce9a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddRequestProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
index 5a4af02..76f88f0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
index 3676c68..7bdf96a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindRequestProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
index 0c222d1..c4cc190 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestBindResponseProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
index 901a4df..100f74e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareRequestProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
index 96484b1..4628b50 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
index 45ce830..13a8ee7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteRequestProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
index 328bb64..75106bf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
index 7a06986..2957fd7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java
index c2d1388..bd39f88 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPException.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java
index 1e7c975..0935db0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestLDAPFilter.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
index c98bb5f..381ddfe 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNRequestProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
index 5dbfb57..8f73443 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
index ab1286f..67ec40a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyRequestProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
index 18230e0..da07fad 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
index 04a34d0..71b7c83 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
index 87cdd36..4431875 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestSearchResultEntryProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
index c33a78e..fd21d0d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/ldap/TestUnbindRequestProtocolOp.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java
index 288fab7..5fc8214 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ChangeNumberControlPluginTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
index 31abeda..bdb7764 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/DependencyTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index 43a04de..7649073 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
index 1327987..3b62e80 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/InitOnLineTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
index 0a4cbc8..4baa0ac 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ProtocolWindowTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
index 3448fb2..bb657c8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index 966f5d0..d9e81e4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
index 8f49cf2..62fcfcc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
index 4cc4ab1..7b9212c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
index 64e72ed..e32d2e4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java
index 00b8c50..f3f427b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNTest.java
index 4cedafa..b0b190b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/MultiDomainServerStateTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/MultiDomainServerStateTest.java
index 928edde..5f9d77e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/MultiDomainServerStateTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/MultiDomainServerStateTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java
index 4d48ca5..f491e04 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/ServerStateTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
index 03db222..a12522e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AssuredReplicationPluginTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
index 95d2102..fb07c60 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/AttrInfoTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
index a56df75..29ca5a1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/DomainFakeCfg.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
index c976d46..5304986 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ExternalChangelogDomainFakeCfg.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
index e6355af..d46b539 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/FractionalReplicationTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
index 395edc2..223fd3e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GenerationIdChecksumTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
index 34e98b1..9133db8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/GroupIdHandshakeTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
index 9590fa0..8c75676 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
index ad9b933..100343e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
index fed056b..705b3cd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/IsolationTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
index 1ff316b..aeba2c5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/MultimasterReplicationFakeConf.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/MultimasterReplicationFakeConf.java
index 604b9aa..4669464 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/MultimasterReplicationFakeConf.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/MultimasterReplicationFakeConf.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java
index bccf35d..1b48882 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/NamingConflictTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
index da2c194..d22bf02 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/PersistentServerStateTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
index 4bf0d9f..60b71ab 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationRepairControlTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
index 086fc32..e2298a5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerFailoverTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
index ffb2930..dbc3204 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ReplicationServerLoadBalancingTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
index c216171..09fe005 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/StateMachineTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TestSynchronousReplayQueue.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TestSynchronousReplayQueue.java
index 298e02b..34489a6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TestSynchronousReplayQueue.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TestSynchronousReplayQueue.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java
index 60c1299..43784b3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/TopologyViewTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java
index 255fa71..cf8ba9a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ValueInfoTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
index 02b771b..6720b2f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/ProtocolCompatibilityTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
index 0984efe..f54db34 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/protocol/SynchronizationMsgTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
index 763a119..0eefafd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/AssuredReplicationServerTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
index b14db77..e347da3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
index b52c9cb..324804f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java
index 82d38c2..a745f2b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplServerFakeConfiguration.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
index c54f758..5f09b8c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerDynamicConfTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
index d91de26..1fd9ceb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java
index a0fe363..b6cd624 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/ChangeNumberIndexerTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
index 0a797a5..a708775 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/CompositeDBCursorTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBTest.java
index dc2600e..72f04ae 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEChangeNumberIndexDBTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
index fd46809..94e9106 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/JEReplicaDBTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java
index 063fd27..6267d77 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/SequentialDBCursor.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java
index 025e8d1..b8e567c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ComputeBestServerTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java
index a645810..df894f7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeReplicationDomain.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java
index 9191fd3..12fbafa 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/FakeStressReplicationDomain.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java
index 070914e..a9c222c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/service/ReplicationDomainTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
index ccb396f..0caa73b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ApproximatematchingRule.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
index 6f50bc0..5ad2306 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
index 748a204..30d0d80 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeTypeSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
index 37a0542..2f9521c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/AuthPasswordEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
index c3686fe..8402784 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleTest.java
index f728c20..031656f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
index 999c7cf..7acae79 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java
index 93b2c50..cca3de6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/BooleanEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleTest.java
index 80e7660..09f470d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleTest.java
index e4621ab..06c7401 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java
index 5f75d15..a3cd75e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleTest.java
index e455434..678a68b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactOrderingMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java
index 51f594a..cc1bc60 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseExactSubstringMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleTest.java
index ae7571e..49c49f8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
index e842762..3308d19 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
index c733178..2681108 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleTest.java
index a1c6107..6cbb8b1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreOrderingMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java
index 0778597..07eaabe 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CaseIgnoreSubstringMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java
index 2c086f0..1396c82 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CertificateSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
index daf2750..62137db 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
index 142f3a5..de9a50b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CountryStringSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CountryStringSyntaxTest.java
index 27cfdbd..49bf1d2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CountryStringSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CountryStringSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java
index 997ec00..639e7e9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DITContentRuleSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java
index 6b07c13..612cfab 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java
index e798ad3..233a7ec 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
index e9d2ce0..75a8710 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualLengthApproximateMatchingRule.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
index 44b2ff1..a541842 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/EqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleTest.java
index 8f0b70b..f5912d6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleTest.java
index 44fac1f..6ca0908 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeOrderingMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
index cb5f1ac..edaa998 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GeneralizedTimeSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
index d1766ca..85b22e3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java
index f8a2575..deedf84 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/GuideSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java
index d063d3c..0466f6b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IA5StringSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java
index e51f106..fdf0ae4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleTest.java
index 530f7b1..0906940 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerOrderingMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerSyntaxTest.java
index 632da0f..7a4ad78 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/IntegerSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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/CDDLv1_0.txt
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
  * or http://forgerock.org/license/CDDLv1.0.html.
  * 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/CDDLv1_0.txt.  If applicable,
- * add the following below this CDDL HEADER, with the fields enclosed
- * by brackets "[]" replaced with your own identifying information:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java
index 994e242..facd8a8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/JPEGSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
index 149b03a..0c408f5 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/LDAPSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java
index 1bf298e..5a292ef 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
index c27e553..8ce00f6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/MatchingRuleUseSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleTest.java
index c0c22d0..3cac026 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleTest.java
index 7c6fe39..a7b2144 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringOrderingMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java
index a09315c..90f9c53 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/NumericStringSubstringMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
index b78395b..d99591f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OrderingMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java
index 1775900..3326ccd 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/OtherMailboxSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleTest.java
index 5b59e64..e04269c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/PresentationAddressEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleTest.java
index 796b7fd..85b23d4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/ProtocolInformationEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java
index fc00d37..8252d95 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SchemaTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
index 402570c..85e829f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/StringPrepProfileTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
index 1d7dfa0..403d9ec 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/SubstringMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java
index 35b44d0..9a17501 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TelexSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
index 64acedb..a76551f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/TimeBasedMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java
index 49532b8..be7ca5a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UTCTimeSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleTest.java
index 49ca4f4..06dcf40 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java
index f497a19..142977d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDOrderingMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java
index 8697eb4..8f90009 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UUIDSyntaxTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java
index dafff72..cb92aac 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
index d009ff1..c5efc11 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/UserPasswordEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/WordEqualityMatchingRuleTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/WordEqualityMatchingRuleTest.java
index 40dd76c..fe48469 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/WordEqualityMatchingRuleTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/WordEqualityMatchingRuleTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
index 779b38c..d447b1a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPConnectionManager.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
index 1a34cb9..de329b6 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPSyncManagerV2AccessTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java
index 86fe4be..f7860b8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/snmp/SNMPTrapManagerTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
index 270f459..5d82d26 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AddSchemaFileTaskTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
index 85f7a58..c64af9b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/AllowedTaskTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
index 93f1d63..b907fb8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DisconnectClientTaskTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java
index eb91524..98ed96f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/DummyTask.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java
index ebc0c5c..2ab3289 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LdifFileWriter.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java
index dd393f8..df7ed4c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/LockdownModeTaskTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
index c089305..f0a751b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TasksTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java
index 828687f..464e482 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestBackupAndRestore.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
index f845f2c..b21f622 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestImportAndExport.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java
index 6b28108..94327e3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tasks/TestRebuildTask.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
index 7fb4497..2e833b9 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
index 31a71d7..9784ebe 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ImportLDIFTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
index 1fd956d..f08191c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPAuthenticationHandlerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
index f0e9be3..b4f37ce 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
index be447f2..426fca0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
index 8ac5932..e891031 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
index e6934ea..d41e044 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchNoServerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchNoServerTestCase.java
index 93cc872..e6b831f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchNoServerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchNoServerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
index e74f2fc..ce046c1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
index 8768e42..6f8f323 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFSearchTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFSearchTestCase.java
index cd17b1a..6a28df8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFSearchTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFSearchTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
index e7d25b1..99f8a0f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java
index be42a34..35346f4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ManageAccountTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java
index 1dd6e3e..43223d7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/RebuildIndexTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java
index 8a9d2f3..702276d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ToolsTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java
index c830d44..6bcb047 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/UpgradeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java
index 0ad6fa5..d242be1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/VerifyIndexTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
index 071e3e4..bbf7651 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigLdapConnectionTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
index 96149db..8402e9e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/dsconfig/DsconfigOptionsTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
index 18fa717..c0d54ff 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/makeldif/MakeLDIFTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java
index c0f80bf..50c75ed 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AdditionalLogItemTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
index 8495d1d..2f27196 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeBuilderTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeTypeConstants.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeTypeConstants.java
index b536725..46376e3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeTypeConstants.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributeTypeConstants.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java
index 72cef67..9775e03 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/AttributesTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceReaderTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceReaderTest.java
index dda7356..8875ba4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceReaderTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceReaderTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceTest.java
index 634f9c0..43b3484 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteSequenceTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringBuilderTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringBuilderTest.java
index 65aefb4..8ff07a4 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringBuilderTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringBuilderTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringTest.java
index 56a4ddc..0e4ebc2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ByteStringTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java
index 3dba45e..31cbebf 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/ConditionResultTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java
index 3396c1f..b47a676 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DITContentRuleTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java
index 8a0e745..7d92b2a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/DirectoryExceptionTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
index ea4a5ee..7337757 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/EntrySchemaCheckingTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/HostPortTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/HostPortTest.java
index 306b100..6c7c98e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/HostPortTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/HostPortTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java
index e05e3c3..43ce2e2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/InitializationExceptionTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java
index 9595dea..f689396 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTest.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java
index 3825a13..7c34778 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/LDAPURLTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
index 62a9b65..1bd2aff 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/PrivilegeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java
index 504d38f..aa40f22 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/SearchFilterTests.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java
index d3cb133..21d376c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAddressMask.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java
index c847daa..623399c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeType.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeValue.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeValue.java
index 35f338f..237f52a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeValue.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestAttributeValue.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java
index 4a062b2..67eff1d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestCommonSchemaElements.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java
index 598fba0..c6f2edc 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestDN.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
index 303b64a..084d79c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestEntry.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
index 4f1f283..1377d8c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestObjectClass.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java
index 4cc1358..ae92069 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestRDN.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestSubtreeSpecification.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestSubtreeSpecification.java
index a2ed15d..8c58f5a 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestSubtreeSpecification.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TestSubtreeSpecification.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java
index 839acb7..a6f871d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/TypesTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java
index c7bf4ee..cce3cab 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeRuleTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
index d92353e..579ae38 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/types/VirtualAttributeTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java
index 2065c83..b9df79b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/CertificateManagerTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/EmbeddedUtilsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/EmbeddedUtilsTestCase.java
index 59c841e..c3149e0 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/EmbeddedUtilsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/EmbeddedUtilsTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/LevenshteinDistanceTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/LevenshteinDistanceTestCase.java
index 4ff9d0f..2490e12 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/LevenshteinDistanceTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/LevenshteinDistanceTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/PackageInfoTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/PackageInfoTestCase.java
index 4720ef9..619f9c2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/PackageInfoTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/PackageInfoTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java
index 183137a..cc65163 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestAddChangeRecordEntry.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java
index 0050306..85ceec2 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestBase64.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java
index c357cd6..e0e418b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestChangeRecordEntry.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java
index 48ea5c2..890090c 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestCrypt.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java
index 0262f14..5052022 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestDeleteChangeRecordEntry.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
index 6d69921..dfa9f98 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFReader.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
index a50d7ab..0374dd8 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestLDIFWriter.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java
index 0c40bb8..cf94258 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyChangeRecordEntry.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java
index 75ece90..33fea57 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestModifyDNChangeRecordEntry.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
index af075c2..eeb0921 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/TestStaticUtils.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java
index ced6950..d8ea654 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/UtilTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/ValidatorTests.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/ValidatorTests.java
index cb71fac..468e085 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/ValidatorTests.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/ValidatorTests.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/ArgsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/ArgsTestCase.java
index 00f3725..487db43 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/ArgsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/ArgsTestCase.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/TestSubCommand.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/TestSubCommand.java
index f9807ee..92cfb5b 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/TestSubCommand.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/TestSubCommand.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/TestSubCommandArgumentParser.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/TestSubCommandArgumentParser.java
index f8eaab4..626014f 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/TestSubCommandArgumentParser.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/util/args/TestSubCommandArgumentParser.java
@@ -6,17 +6,16 @@
  * (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.
+ * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
+ * or http://forgerock.org/license/CDDLv1.0.html.
  * 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:
+ * file and include the License file at legal-notices/CDDLv1_0.txt.
+ * 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

--
Gitblit v1.10.0