NO-JIRA: create branch for qpid-cpp 0.34 RC process

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-cpp-0.34-rc@1687469 13f79535-47bb-0310-9956-ffa450edef68

2558 files changed, 98 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..97872000d8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,93 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#Python
+*.pyc
+*.out
+#CPP
+*.o
+*.la
+*.lo
+*.vglog
+.dirstamp
+Makefile.in
+config(?!\.sh)\.*
+configure
+.deps
+.libs
+autom4te.cache
+*.m4
+developer.doxygen
+user.doxygen
+qpid/cpp/libtool
+qpidc.spec
+qpid/cpp/src/gen/
+*gen.mk
+*.timestamp
+*.pcl
+qpid/cpp/managementgen/management-types.xml
+
+#Java
+*.class
+velocity.log*
+qpid/java/build
+release
+.classpath
+.project
+.settings
+generated/
+target
+classes
+qpid/java/lib/*.jar
+qpid/java/lib/required
+qpid/java/lib/bdbstore
+qpid/java/lib/cobertura
+qpid/java/lib/findbugs
+qpid/java/lib/ivy
+qpid/java/lib/csvjdbc
+qpid/java/lib/jfree
+qpid/java/lib/bonecp
+qpid/java/build.overrides
+qpid/java/felix-cache/*
+qpid/java/eclipse-projects
+qpid/java/derby.log
+# Intellij Project files
+*.iml
+*.ipr
+*.iws
+# Emacs
+*~
+# Microsoft Visual Studio artifacts
+*.vcproj.*.*.user
+*.ncb
+*.suo
+*.ilk
+*.pdb
+# Windows build results
+*.exe
+*.lib
+*.dll
+# MacOS File
+.DS_Store
+
+#Eclipse workspace
+workspace/
+
+*.swp
+
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..f1d23dda08
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Andrew Stitcher <astitcher@apache.org>
+Andrew Stitcher <astitcher@apache.org =  astitcher = Andrew Michael Stitcher astitcher@apache.org@apache.org>
+Clifford Jansen <cliffjansen@apache.org>
+Ken Giusti <kgiusti@apache.org>
+Andrew MacBean <macbean@unknown>
diff --git a/KEYS b/qpid/KEYS
index ca3ef4d0fd..ca3ef4d0fd 100644
--- a/KEYS
+++ b/qpid/KEYS
diff --git a/LICENSE b/qpid/LICENSE
index 2cbe987a10..2cbe987a10 100644
--- a/LICENSE
+++ b/qpid/LICENSE
diff --git a/NOTICE b/qpid/NOTICE
index 39a002e222..39a002e222 100644
--- a/NOTICE
+++ b/qpid/NOTICE
diff --git a/QPID_VERSION.txt b/qpid/QPID_VERSION.txt
index 94b357edfe..94b357edfe 100644
--- a/QPID_VERSION.txt
+++ b/qpid/QPID_VERSION.txt
diff --git a/README.txt b/qpid/README.txt
index ccd92c757b..ccd92c757b 100644
--- a/README.txt
+++ b/qpid/README.txt
diff --git a/bin/LICENSE b/qpid/bin/LICENSE
index bc46b77047..bc46b77047 100644
--- a/bin/LICENSE
+++ b/qpid/bin/LICENSE
diff --git a/bin/NOTICE b/qpid/bin/NOTICE
index 05f39ba176..05f39ba176 100644
--- a/bin/NOTICE
+++ b/qpid/bin/NOTICE
diff --git a/bin/install-cpp-python b/qpid/bin/install-cpp-python
index d43e8e4899..d43e8e4899 100755
--- a/bin/install-cpp-python
+++ b/qpid/bin/install-cpp-python
diff --git a/bin/mvn-deploy-qpid-java.sh b/qpid/bin/mvn-deploy-qpid-java.sh
index 3c2a9fd05f..3c2a9fd05f 100755
--- a/bin/mvn-deploy-qpid-java.sh
+++ b/qpid/bin/mvn-deploy-qpid-java.sh
diff --git a/bin/set_svn_properties.sh b/qpid/bin/set_svn_properties.sh
index cc29490eea..cc29490eea 100755
--- a/bin/set_svn_properties.sh
+++ b/qpid/bin/set_svn_properties.sh
diff --git a/buildtools/LICENSE b/qpid/buildtools/LICENSE
index bc46b77047..bc46b77047 100644
--- a/buildtools/LICENSE
+++ b/qpid/buildtools/LICENSE
diff --git a/buildtools/NOTICE b/qpid/buildtools/NOTICE
index 5813a7a09a..5813a7a09a 100644
--- a/buildtools/NOTICE
+++ b/qpid/buildtools/NOTICE
diff --git a/buildtools/buildCreator/build.config b/qpid/buildtools/buildCreator/build.config
index cb45e99a6e..cb45e99a6e 100644
--- a/buildtools/buildCreator/build.config
+++ b/qpid/buildtools/buildCreator/build.config
diff --git a/buildtools/buildCreator/buildCreator.py b/qpid/buildtools/buildCreator/buildCreator.py
index 0a26ce09b0..0a26ce09b0 100755
--- a/buildtools/buildCreator/buildCreator.py
+++ b/qpid/buildtools/buildCreator/buildCreator.py
diff --git a/buildtools/buildCreator/qpid.build b/qpid/buildtools/buildCreator/qpid.build
index f55025dc8d..f55025dc8d 100644
--- a/buildtools/buildCreator/qpid.build
+++ b/qpid/buildtools/buildCreator/qpid.build
diff --git a/cpp/.gitignore b/qpid/cpp/.gitignore
index 63a3f41f28..63a3f41f28 100644
--- a/cpp/.gitignore
+++ b/qpid/cpp/.gitignore
diff --git a/cpp/AMQP_1.0 b/qpid/cpp/AMQP_1.0
index 95f02b8e53..95f02b8e53 100644
--- a/cpp/AMQP_1.0
+++ b/qpid/cpp/AMQP_1.0
diff --git a/cpp/BuildInstallSettings.cmake b/qpid/cpp/BuildInstallSettings.cmake
index b502854cc9..b502854cc9 100644
--- a/cpp/BuildInstallSettings.cmake
+++ b/qpid/cpp/BuildInstallSettings.cmake
diff --git a/cpp/CMakeLists.txt b/qpid/cpp/CMakeLists.txt
index 3b1890f976..3b1890f976 100644
--- a/cpp/CMakeLists.txt
+++ b/qpid/cpp/CMakeLists.txt
diff --git a/cpp/CMakeModules/CheckSizetDistinct.cmake b/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake
index 2ae4a89de9..2ae4a89de9 100755
--- a/cpp/CMakeModules/CheckSizetDistinct.cmake
+++ b/qpid/cpp/CMakeModules/CheckSizetDistinct.cmake
diff --git a/cpp/CMakeModules/FindProton.cmake b/qpid/cpp/CMakeModules/FindProton.cmake
index 39792e9d6f..39792e9d6f 100644
--- a/cpp/CMakeModules/FindProton.cmake
+++ b/qpid/cpp/CMakeModules/FindProton.cmake
diff --git a/cpp/CTestConfig.cmake b/qpid/cpp/CTestConfig.cmake
index 7b8a6cb3cf..7b8a6cb3cf 100755
--- a/cpp/CTestConfig.cmake
+++ b/qpid/cpp/CTestConfig.cmake
diff --git a/cpp/DESIGN b/qpid/cpp/DESIGN
index f44aa8a5af..f44aa8a5af 100644
--- a/cpp/DESIGN
+++ b/qpid/cpp/DESIGN
diff --git a/cpp/INSTALL b/qpid/cpp/INSTALL
index 717c9b0908..717c9b0908 100644
--- a/cpp/INSTALL
+++ b/qpid/cpp/INSTALL
diff --git a/cpp/INSTALL-WINDOWS b/qpid/cpp/INSTALL-WINDOWS
index 71c40fa3f5..71c40fa3f5 100644
--- a/cpp/INSTALL-WINDOWS
+++ b/qpid/cpp/INSTALL-WINDOWS
diff --git a/cpp/LICENSE b/qpid/cpp/LICENSE
index 6b0b1270ff..6b0b1270ff 100644
--- a/cpp/LICENSE
+++ b/qpid/cpp/LICENSE
diff --git a/cpp/NOTICE b/qpid/cpp/NOTICE
index d01ceebe36..d01ceebe36 100644
--- a/cpp/NOTICE
+++ b/qpid/cpp/NOTICE
diff --git a/cpp/QPID_VERSION.txt b/qpid/cpp/QPID_VERSION.txt
index 94b357edfe..94b357edfe 100644
--- a/cpp/QPID_VERSION.txt
+++ b/qpid/cpp/QPID_VERSION.txt
diff --git a/cpp/README-HA.txt b/qpid/cpp/README-HA.txt
index 106d20c24f..106d20c24f 100644
--- a/cpp/README-HA.txt
+++ b/qpid/cpp/README-HA.txt
diff --git a/cpp/README-winsdk.txt b/qpid/cpp/README-winsdk.txt
index 793063198a..793063198a 100644
--- a/cpp/README-winsdk.txt
+++ b/qpid/cpp/README-winsdk.txt
diff --git a/cpp/README.txt b/qpid/cpp/README.txt
index 0a62de1198..0a62de1198 100644
--- a/cpp/README.txt
+++ b/qpid/cpp/README.txt
diff --git a/cpp/RELEASE_NOTES b/qpid/cpp/RELEASE_NOTES
index a8995c6039..a8995c6039 100644
--- a/cpp/RELEASE_NOTES
+++ b/qpid/cpp/RELEASE_NOTES
diff --git a/cpp/SSL b/qpid/cpp/SSL
index 65f4577ab2..65f4577ab2 100644
--- a/cpp/SSL
+++ b/qpid/cpp/SSL
diff --git a/cpp/bindings/CMakeLists.txt b/qpid/cpp/bindings/CMakeLists.txt
index 3c55871ee6..3c55871ee6 100644
--- a/cpp/bindings/CMakeLists.txt
+++ b/qpid/cpp/bindings/CMakeLists.txt
diff --git a/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt b/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt
index 32fce36e1d..32fce36e1d 100644
--- a/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/CMakeLists.txt
diff --git a/cpp/bindings/qmf2/examples/cpp/README.txt b/qpid/cpp/bindings/qmf2/examples/cpp/README.txt
index 8ab3d17517..8ab3d17517 100644
--- a/cpp/bindings/qmf2/examples/cpp/README.txt
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/README.txt
diff --git a/cpp/bindings/qmf2/examples/cpp/agent.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
index faa5d5f4ca..faa5d5f4ca 100644
--- a/cpp/bindings/qmf2/examples/cpp/agent.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
diff --git a/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
index 0b09bbf85f..0b09bbf85f 100644
--- a/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
diff --git a/cpp/bindings/qmf2/examples/cpp/list_agents.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
index 5fff985118..5fff985118 100644
--- a/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
diff --git a/cpp/bindings/qmf2/examples/cpp/print_events.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
index 413c01bb62..413c01bb62 100644
--- a/cpp/bindings/qmf2/examples/cpp/print_events.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
diff --git a/cpp/bindings/qmf2/examples/python/agent.py b/qpid/cpp/bindings/qmf2/examples/python/agent.py
index a9f1a14349..a9f1a14349 100755
--- a/cpp/bindings/qmf2/examples/python/agent.py
+++ b/qpid/cpp/bindings/qmf2/examples/python/agent.py
diff --git a/cpp/bindings/qmf2/examples/python/find_agents.py b/qpid/cpp/bindings/qmf2/examples/python/find_agents.py
index 852f23f747..852f23f747 100644
--- a/cpp/bindings/qmf2/examples/python/find_agents.py
+++ b/qpid/cpp/bindings/qmf2/examples/python/find_agents.py
diff --git a/cpp/bindings/qmf2/examples/ruby/agent_external.rb b/qpid/cpp/bindings/qmf2/examples/ruby/agent_external.rb
index 75171931ed..75171931ed 100644
--- a/cpp/bindings/qmf2/examples/ruby/agent_external.rb
+++ b/qpid/cpp/bindings/qmf2/examples/ruby/agent_external.rb
diff --git a/cpp/bindings/qmf2/examples/ruby/agent_internal.rb b/qpid/cpp/bindings/qmf2/examples/ruby/agent_internal.rb
index fc49a885f7..fc49a885f7 100644
--- a/cpp/bindings/qmf2/examples/ruby/agent_internal.rb
+++ b/qpid/cpp/bindings/qmf2/examples/ruby/agent_internal.rb
diff --git a/cpp/bindings/qmf2/examples/ruby/find_agents.rb b/qpid/cpp/bindings/qmf2/examples/ruby/find_agents.rb
index 41de7e5abe..41de7e5abe 100644
--- a/cpp/bindings/qmf2/examples/ruby/find_agents.rb
+++ b/qpid/cpp/bindings/qmf2/examples/ruby/find_agents.rb
diff --git a/cpp/bindings/qmf2/python/CMakeLists.txt b/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
index 3acd5830fd..3acd5830fd 100644
--- a/cpp/bindings/qmf2/python/CMakeLists.txt
+++ b/qpid/cpp/bindings/qmf2/python/CMakeLists.txt
diff --git a/cpp/bindings/qmf2/python/cqmf2.i b/qpid/cpp/bindings/qmf2/python/cqmf2.i
index 6b5326f8cf..6b5326f8cf 100644
--- a/cpp/bindings/qmf2/python/cqmf2.i
+++ b/qpid/cpp/bindings/qmf2/python/cqmf2.i
diff --git a/cpp/bindings/qmf2/python/qmf2.py b/qpid/cpp/bindings/qmf2/python/qmf2.py
index 601e68f7b6..601e68f7b6 100644
--- a/cpp/bindings/qmf2/python/qmf2.py
+++ b/qpid/cpp/bindings/qmf2/python/qmf2.py
diff --git a/cpp/bindings/qmf2/ruby/CMakeLists.txt b/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
index 74fe777805..74fe777805 100644
--- a/cpp/bindings/qmf2/ruby/CMakeLists.txt
+++ b/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
diff --git a/cpp/bindings/qmf2/ruby/qmf2.rb b/qpid/cpp/bindings/qmf2/ruby/qmf2.rb
index b38aeae6dc..b38aeae6dc 100644
--- a/cpp/bindings/qmf2/ruby/qmf2.rb
+++ b/qpid/cpp/bindings/qmf2/ruby/qmf2.rb
diff --git a/cpp/bindings/qmf2/ruby/ruby.i b/qpid/cpp/bindings/qmf2/ruby/ruby.i
index 65d0770224..65d0770224 100644
--- a/cpp/bindings/qmf2/ruby/ruby.i
+++ b/qpid/cpp/bindings/qmf2/ruby/ruby.i
diff --git a/cpp/bindings/qpid/dotnet/CMakeLists.txt b/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt
index 4f66c80498..4f66c80498 100644
--- a/cpp/bindings/qpid/dotnet/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/dotnet/CMakeLists.txt
diff --git a/cpp/bindings/qpid/dotnet/ReadMe.txt b/qpid/cpp/bindings/qpid/dotnet/ReadMe.txt
index c709a27637..c709a27637 100644
--- a/cpp/bindings/qpid/dotnet/ReadMe.txt
+++ b/qpid/cpp/bindings/qpid/dotnet/ReadMe.txt
diff --git a/cpp/bindings/qpid/dotnet/configure-windows.ps1 b/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
index a698dc88ba..a698dc88ba 100644
--- a/cpp/bindings/qpid/dotnet/configure-windows.ps1
+++ b/qpid/cpp/bindings/qpid/dotnet/configure-windows.ps1
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
index 6976be5d02..6976be5d02 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
index 592a05ab29..592a05ab29 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.receiver/csharp.direct.receiver.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
index 12368def8e..12368def8e 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
index a0ac742a45..a0ac742a45 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.direct.sender/csharp.direct.sender.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
index eddb759ef1..eddb759ef1 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
index 19a5267297..19a5267297 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.client/csharp.example.client.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
index 4e065803f6..4e065803f6 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
index 06267bf719..06267bf719 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.declare_queues/csharp.example.declare_queues.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
index 6059f76442..6059f76442 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Options.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
index d949dde644..d949dde644 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
index da8218bbf7..da8218bbf7 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.drain/csharp.example.drain.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
index 17bbd842b0..17bbd842b0 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
index 336970a3ba..336970a3ba 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.helloworld/csharp.example.helloworld.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
index 7f0fd52997..7f0fd52997 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
index 7e0b259a23..7e0b259a23 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.server/csharp.example.server.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
index 9ceb11e520..9ceb11e520 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Options.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
index f07c780571..f07c780571 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
index 531abadd4c..531abadd4c 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.example.spout/csharp.example.spout.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
index 459130ec6c..459130ec6c 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
index 3bc22b2ce8..3bc22b2ce8 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
index 2be4011f19..2be4011f19 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
index 4cc88564e7..4cc88564e7 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.callback.sender/csharp.map.callback.sender.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
index f11ce8c220..f11ce8c220 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
index f8bd9e9294..f8bd9e9294 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.receiver/csharp.map.receiver.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
index ee09057f18..ee09057f18 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
index 9001eb8e0b..9001eb8e0b 100644
--- a/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/csharp.map.sender/csharp.map.sender.cs
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in
index 349708b026..349708b026 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/anyproject.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in
index b88171db68..b88171db68 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.drain/csharp.example.drain.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in
index d6c7d43a56..d6c7d43a56 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.example.spout/csharp.example.spout.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
index ee851d39f1..ee851d39f1 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
index 2fa6a63072..2fa6a63072 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvc9/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in
index 34fad8d9c3..34fad8d9c3 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/anyproject.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/examples/msvcx/app.config b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/app.config
index a1ff128fab..a1ff128fab 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvcx/app.config
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/app.config
diff --git a/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in
index 704dab73fd..704dab73fd 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.drain/csharp.example.drain.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in
index 492459b96a..492459b96a 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.example.spout/csharp.example.spout.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
index bf9beef133..bf9beef133 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
index f475921566..f475921566 100644
--- a/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/examples/msvcx/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in b/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in
index 5e754aa752..5e754aa752 100644
--- a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in
+++ b/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sessionreceiver.sln.in
diff --git a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in b/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in
index 7ebbe7c9e0..7ebbe7c9e0 100644
--- a/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in
+++ b/qpid/cpp/bindings/qpid/dotnet/msvc9/org.apache.qpid.messaging.sln.in
diff --git a/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in b/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in
index 2909a66784..2909a66784 100644
--- a/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in
+++ b/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sessionreceiver.sln.in
diff --git a/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in b/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in
index aa1820c54a..aa1820c54a 100644
--- a/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in
+++ b/qpid/cpp/bindings/qpid/dotnet/msvcx/org.apache.qpid.messaging.sln.in
diff --git a/cpp/bindings/qpid/dotnet/src/Address.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp
index e47db9f925..e47db9f925 100644
--- a/cpp/bindings/qpid/dotnet/src/Address.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Address.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Address.h b/qpid/cpp/bindings/qpid/dotnet/src/Address.h
index 108a265923..108a265923 100644
--- a/cpp/bindings/qpid/dotnet/src/Address.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Address.h
diff --git a/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp b/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
index 00d50900f6..00d50900f6 100644
--- a/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/AssemblyInfo-template.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Connection.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
index d4d5d2fd4f..d4d5d2fd4f 100644
--- a/cpp/bindings/qpid/dotnet/src/Connection.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Connection.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Connection.h b/qpid/cpp/bindings/qpid/dotnet/src/Connection.h
index 82b5262084..82b5262084 100644
--- a/cpp/bindings/qpid/dotnet/src/Connection.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Connection.h
diff --git a/cpp/bindings/qpid/dotnet/src/Duration.h b/qpid/cpp/bindings/qpid/dotnet/src/Duration.h
index d449992cdc..d449992cdc 100644
--- a/cpp/bindings/qpid/dotnet/src/Duration.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Duration.h
diff --git a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
index 4397789f42..4397789f42 100644
--- a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
index 1ad5c4b42b..1ad5c4b42b 100644
--- a/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/FailoverUpdates.h
diff --git a/cpp/bindings/qpid/dotnet/src/Logger.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Logger.cpp
index b084db5a6c..b084db5a6c 100644
--- a/cpp/bindings/qpid/dotnet/src/Logger.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Logger.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Logger.h b/qpid/cpp/bindings/qpid/dotnet/src/Logger.h
index 1628fb19ff..1628fb19ff 100644
--- a/cpp/bindings/qpid/dotnet/src/Logger.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Logger.h
diff --git a/cpp/bindings/qpid/dotnet/src/Message.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
index cbf477bcaa..cbf477bcaa 100644
--- a/cpp/bindings/qpid/dotnet/src/Message.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Message.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Message.h b/qpid/cpp/bindings/qpid/dotnet/src/Message.h
index c706d11ce5..c706d11ce5 100644
--- a/cpp/bindings/qpid/dotnet/src/Message.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Message.h
diff --git a/cpp/bindings/qpid/dotnet/src/QpidException.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h
index bf02134203..bf02134203 100644
--- a/cpp/bindings/qpid/dotnet/src/QpidException.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/QpidException.h
diff --git a/cpp/bindings/qpid/dotnet/src/QpidMarshal.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidMarshal.h
index 60f40afe04..60f40afe04 100644
--- a/cpp/bindings/qpid/dotnet/src/QpidMarshal.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/QpidMarshal.h
diff --git a/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h b/qpid/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
index a3fdaf99c2..a3fdaf99c2 100644
--- a/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/QpidTypeCheck.h
diff --git a/cpp/bindings/qpid/dotnet/src/ReadMe.txt b/qpid/cpp/bindings/qpid/dotnet/src/ReadMe.txt
index f7287af573..f7287af573 100644
--- a/cpp/bindings/qpid/dotnet/src/ReadMe.txt
+++ b/qpid/cpp/bindings/qpid/dotnet/src/ReadMe.txt
diff --git a/cpp/bindings/qpid/dotnet/src/Receiver.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
index 2d6b2f56c3..2d6b2f56c3 100644
--- a/cpp/bindings/qpid/dotnet/src/Receiver.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Receiver.h b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.h
index c38590c1b0..c38590c1b0 100644
--- a/cpp/bindings/qpid/dotnet/src/Receiver.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Receiver.h
diff --git a/cpp/bindings/qpid/dotnet/src/Sender.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp
index 3d863eb7c7..3d863eb7c7 100644
--- a/cpp/bindings/qpid/dotnet/src/Sender.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Sender.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Sender.h b/qpid/cpp/bindings/qpid/dotnet/src/Sender.h
index 3ecc615608..3ecc615608 100644
--- a/cpp/bindings/qpid/dotnet/src/Sender.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Sender.h
diff --git a/cpp/bindings/qpid/dotnet/src/Session.cpp b/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp
index c5f00e86ab..c5f00e86ab 100644
--- a/cpp/bindings/qpid/dotnet/src/Session.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Session.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/Session.h b/qpid/cpp/bindings/qpid/dotnet/src/Session.h
index 42e9475c6c..42e9475c6c 100644
--- a/cpp/bindings/qpid/dotnet/src/Session.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/Session.h
diff --git a/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp b/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
index 01ec8056c6..01ec8056c6 100644
--- a/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
+++ b/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.cpp
diff --git a/cpp/bindings/qpid/dotnet/src/TypeTranslator.h b/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
index 67af712c84..67af712c84 100644
--- a/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/TypeTranslator.h
diff --git a/cpp/bindings/qpid/dotnet/src/app.rc b/qpid/cpp/bindings/qpid/dotnet/src/app.rc
index 35b3d8df68..35b3d8df68 100644
--- a/cpp/bindings/qpid/dotnet/src/app.rc
+++ b/qpid/cpp/bindings/qpid/dotnet/src/app.rc
diff --git a/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in b/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in
index c98252a539..c98252a539 100644
--- a/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/src/msvc9/org.apache.qpid.messaging.vcproj.in
diff --git a/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in b/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in
index 5d176e7586..5d176e7586 100644
--- a/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in
+++ b/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.filters.in
diff --git a/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in b/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in
index db95fa6927..db95fa6927 100644
--- a/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/src/msvcx/org.apache.qpid.messaging.vcxproj.in
diff --git a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
index 8ce231912d..8ce231912d 100644
--- a/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
+++ b/qpid/cpp/bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc
diff --git a/cpp/bindings/qpid/dotnet/src/qpid.snk b/qpid/cpp/bindings/qpid/dotnet/src/qpid.snk
index 9faafd8f8b..9faafd8f8b 100644
--- a/cpp/bindings/qpid/dotnet/src/qpid.snk
+++ b/qpid/cpp/bindings/qpid/dotnet/src/qpid.snk
diff --git a/cpp/bindings/qpid/dotnet/src/resource1.h b/qpid/cpp/bindings/qpid/dotnet/src/resource1.h
index 12cc93450b..12cc93450b 100644
--- a/cpp/bindings/qpid/dotnet/src/resource1.h
+++ b/qpid/cpp/bindings/qpid/dotnet/src/resource1.h
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs
index de057ce9be..de057ce9be 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/Properties/sessionreceiver-AssemblyInfo-template.cs
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj.in
index 1c54517823..1c54517823 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvc9/org.apache.qpid.messaging.sessionreceiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj.in
index 33d1f562e3..33d1f562e3 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/msvcx/org.apache.qpid.messaging.sessionreceiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk
index 9faafd8f8b..9faafd8f8b 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/qpid.snk
diff --git a/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
index a15a8d60fe..a15a8d60fe 100644
--- a/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/src/sessionreceiver/sessionreceiver.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
index 81a89ce393..81a89ce393 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/Properties/AssemblyInfo.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs
index 22ad186c9a..22ad186c9a 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.address.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs
index c93f1d63f7..c93f1d63f7 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.connection.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs
index dc7af0a7c8..dc7af0a7c8 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs
index 2512d7936c..2512d7936c 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.duration.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs
index bf9620d785..bf9620d785 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/messaging.test.message.cs
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj.in b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj.in
index 13874d35b1..13874d35b1 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvc9/messaging.test.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/test/messaging.test/msvcx/messaging.test.csproj.in b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvcx/messaging.test.csproj.in
index c77315f0be..c77315f0be 100644
--- a/cpp/bindings/qpid/dotnet/test/messaging.test/msvcx/messaging.test.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/test/messaging.test/msvcx/messaging.test.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
index 45258fa843..45258fa843 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
index f11603ac69..f11603ac69 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj.in
index 1d78ff1a66..1d78ff1a66 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.client/csharp.example.client.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
index d3082838ef..d3082838ef 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj.in
index 0f6832b069..0f6832b069 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.drain/csharp.example.drain.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
index a8b1b1465e..a8b1b1465e 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj.in
index d3958ef68f..d3958ef68f 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.server/csharp.example.server.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj.in
index b009ddbf1d..b009ddbf1d 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.example.spout/csharp.example.spout.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
index ddd5523ba6..ddd5523ba6 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
index 747ca6fb3f..747ca6fb3f 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
index b71e1667b9..b71e1667b9 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj.in
index 6775913ede..6775913ede 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/examples/csharp.map.sender/csharp.map.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln.in
index 6db55b5590..6db55b5590 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvc9/winsdk_dotnet_examples.sln.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
index 82f4e384ef..82f4e384ef 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.receiver/csharp.direct.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.sender/csharp.direct.sender.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
index e7e07064bb..e7e07064bb 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.direct.sender/csharp.direct.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.client/csharp.example.client.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.client/csharp.example.client.csproj.in
index 3baddb12b9..3baddb12b9 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.client/csharp.example.client.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.client/csharp.example.client.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
index 99d5a598b0..99d5a598b0 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.declare_queues/csharp.example.declare_queues.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.drain/csharp.example.drain.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.drain/csharp.example.drain.csproj.in
index 5b3eab16ce..5b3eab16ce 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.drain/csharp.example.drain.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.drain/csharp.example.drain.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
index 1ef196cdce..1ef196cdce 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.helloworld/csharp.example.helloworld.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.server/csharp.example.server.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.server/csharp.example.server.csproj.in
index 26f68c8007..26f68c8007 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.server/csharp.example.server.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.server/csharp.example.server.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.spout/csharp.example.spout.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.spout/csharp.example.spout.csproj.in
index 55a41c8de5..55a41c8de5 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.spout/csharp.example.spout.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.example.spout/csharp.example.spout.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
index dc6f6f0db3..dc6f6f0db3 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.receiver/csharp.map.callback.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
index dbc06ae49f..dbc06ae49f 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.callback.sender/csharp.map.callback.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.receiver/csharp.map.receiver.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
index 8ae1bdec87..8ae1bdec87 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.receiver/csharp.map.receiver.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.sender/csharp.map.sender.csproj.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.sender/csharp.map.sender.csproj.in
index ed79f871bd..ed79f871bd 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.sender/csharp.map.sender.csproj.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/examples/csharp.map.sender/csharp.map.sender.csproj.in
diff --git a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/winsdk_dotnet_examples.sln.in b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/winsdk_dotnet_examples.sln.in
index 1e82f6833b..1e82f6833b 100644
--- a/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/winsdk_dotnet_examples.sln.in
+++ b/qpid/cpp/bindings/qpid/dotnet/winsdk_sources/msvcx/winsdk_dotnet_examples.sln.in
diff --git a/cpp/bindings/qpid/examples/perl/client.pl b/qpid/cpp/bindings/qpid/examples/perl/client.pl
index ee7bc6cd53..ee7bc6cd53 100755
--- a/cpp/bindings/qpid/examples/perl/client.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/client.pl
diff --git a/cpp/bindings/qpid/examples/perl/drain.pl b/qpid/cpp/bindings/qpid/examples/perl/drain.pl
index d0150854b2..d0150854b2 100755
--- a/cpp/bindings/qpid/examples/perl/drain.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/drain.pl
diff --git a/cpp/bindings/qpid/examples/perl/hello_world.pl b/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl
index 917038f0ef..917038f0ef 100755
--- a/cpp/bindings/qpid/examples/perl/hello_world.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/hello_world.pl
diff --git a/cpp/bindings/qpid/examples/perl/hello_xml.pl b/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl
index 8d77c4b2b8..8d77c4b2b8 100755
--- a/cpp/bindings/qpid/examples/perl/hello_xml.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/hello_xml.pl
diff --git a/cpp/bindings/qpid/examples/perl/map_receiver.pl b/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl
index 21b1cb09f2..21b1cb09f2 100755
--- a/cpp/bindings/qpid/examples/perl/map_receiver.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/map_receiver.pl
diff --git a/cpp/bindings/qpid/examples/perl/map_sender.pl b/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl
index 27063ef780..27063ef780 100755
--- a/cpp/bindings/qpid/examples/perl/map_sender.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/map_sender.pl
diff --git a/cpp/bindings/qpid/examples/perl/server.pl b/qpid/cpp/bindings/qpid/examples/perl/server.pl
index be43655aeb..be43655aeb 100755
--- a/cpp/bindings/qpid/examples/perl/server.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/server.pl
diff --git a/cpp/bindings/qpid/examples/perl/spout.pl b/qpid/cpp/bindings/qpid/examples/perl/spout.pl
index c97c2a58af..c97c2a58af 100755
--- a/cpp/bindings/qpid/examples/perl/spout.pl
+++ b/qpid/cpp/bindings/qpid/examples/perl/spout.pl
diff --git a/cpp/bindings/qpid/examples/python/console b/qpid/cpp/bindings/qpid/examples/python/console
index 2facc368c3..2facc368c3 100755
--- a/cpp/bindings/qpid/examples/python/console
+++ b/qpid/cpp/bindings/qpid/examples/python/console
diff --git a/cpp/bindings/qpid/examples/python/drain b/qpid/cpp/bindings/qpid/examples/python/drain
index 2b15a50500..2b15a50500 100755
--- a/cpp/bindings/qpid/examples/python/drain
+++ b/qpid/cpp/bindings/qpid/examples/python/drain
diff --git a/cpp/bindings/qpid/examples/python/hello b/qpid/cpp/bindings/qpid/examples/python/hello
index 52ea955093..52ea955093 100755
--- a/cpp/bindings/qpid/examples/python/hello
+++ b/qpid/cpp/bindings/qpid/examples/python/hello
diff --git a/cpp/bindings/qpid/examples/python/hello_xml b/qpid/cpp/bindings/qpid/examples/python/hello_xml
index 05fa5cc7ba..05fa5cc7ba 100755
--- a/cpp/bindings/qpid/examples/python/hello_xml
+++ b/qpid/cpp/bindings/qpid/examples/python/hello_xml
diff --git a/cpp/bindings/qpid/examples/python/server b/qpid/cpp/bindings/qpid/examples/python/server
index fb87951bad..fb87951bad 100755
--- a/cpp/bindings/qpid/examples/python/server
+++ b/qpid/cpp/bindings/qpid/examples/python/server
diff --git a/cpp/bindings/qpid/examples/python/spout b/qpid/cpp/bindings/qpid/examples/python/spout
index 48921d4387..48921d4387 100755
--- a/cpp/bindings/qpid/examples/python/spout
+++ b/qpid/cpp/bindings/qpid/examples/python/spout
diff --git a/cpp/bindings/qpid/examples/python/statistics.py b/qpid/cpp/bindings/qpid/examples/python/statistics.py
index 089b81b740..089b81b740 100644
--- a/cpp/bindings/qpid/examples/python/statistics.py
+++ b/qpid/cpp/bindings/qpid/examples/python/statistics.py
diff --git a/cpp/bindings/qpid/perl/CMakeLists.txt b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
index 3c859d689f..3c859d689f 100644
--- a/cpp/bindings/qpid/perl/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/perl/CMakeLists.txt
diff --git a/cpp/bindings/qpid/perl/ChangeLog b/qpid/cpp/bindings/qpid/perl/ChangeLog
index d55d76ae27..d55d76ae27 100644
--- a/cpp/bindings/qpid/perl/ChangeLog
+++ b/qpid/cpp/bindings/qpid/perl/ChangeLog
diff --git a/cpp/bindings/qpid/perl/LICENSE b/qpid/cpp/bindings/qpid/perl/LICENSE
index bc46b77047..bc46b77047 100644
--- a/cpp/bindings/qpid/perl/LICENSE
+++ b/qpid/cpp/bindings/qpid/perl/LICENSE
diff --git a/cpp/bindings/qpid/perl/Makefile.PL b/qpid/cpp/bindings/qpid/perl/Makefile.PL
index 91686a89e5..91686a89e5 100644
--- a/cpp/bindings/qpid/perl/Makefile.PL
+++ b/qpid/cpp/bindings/qpid/perl/Makefile.PL
diff --git a/cpp/bindings/qpid/perl/Makefile.PL.in b/qpid/cpp/bindings/qpid/perl/Makefile.PL.in
index 75586cfe74..75586cfe74 100644
--- a/cpp/bindings/qpid/perl/Makefile.PL.in
+++ b/qpid/cpp/bindings/qpid/perl/Makefile.PL.in
diff --git a/cpp/bindings/qpid/perl/README b/qpid/cpp/bindings/qpid/perl/README
index ca5a96e539..ca5a96e539 100644
--- a/cpp/bindings/qpid/perl/README
+++ b/qpid/cpp/bindings/qpid/perl/README
diff --git a/cpp/bindings/qpid/perl/lib/qpid.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid.pm
index 1f8d967a65..1f8d967a65 100644
--- a/cpp/bindings/qpid/perl/lib/qpid.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging.pm
index c9d6845eb9..c9d6845eb9 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Address.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Address.pm
index d417770b1c..d417770b1c 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Address.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Address.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Connection.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Connection.pm
index 6d478cdf0c..6d478cdf0c 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Connection.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Connection.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Duration.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Duration.pm
index 7d05daeeab..7d05daeeab 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Duration.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Duration.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Message.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Message.pm
index 6926eb221f..6926eb221f 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Message.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Message.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Receiver.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Receiver.pm
index 811a8660db..811a8660db 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Receiver.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Receiver.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Sender.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Sender.pm
index bb67826a5e..bb67826a5e 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Sender.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Sender.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm
index 316f1fa817..316f1fa817 100644
--- a/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid/messaging/Session.pm
diff --git a/cpp/bindings/qpid/perl/lib/qpid_messaging.pm b/qpid/cpp/bindings/qpid/perl/lib/qpid_messaging.pm
index 2948748422..2948748422 100644
--- a/cpp/bindings/qpid/perl/lib/qpid_messaging.pm
+++ b/qpid/cpp/bindings/qpid/perl/lib/qpid_messaging.pm
diff --git a/cpp/bindings/qpid/perl/perl.i b/qpid/cpp/bindings/qpid/perl/perl.i
index 4dc2665c2b..4dc2665c2b 100644
--- a/cpp/bindings/qpid/perl/perl.i
+++ b/qpid/cpp/bindings/qpid/perl/perl.i
diff --git a/cpp/bindings/qpid/perl/t/Address.t b/qpid/cpp/bindings/qpid/perl/t/Address.t
index 409a63d4fe..409a63d4fe 100644
--- a/cpp/bindings/qpid/perl/t/Address.t
+++ b/qpid/cpp/bindings/qpid/perl/t/Address.t
diff --git a/cpp/bindings/qpid/perl/t/Duration.t b/qpid/cpp/bindings/qpid/perl/t/Duration.t
index 4f2ae1c606..4f2ae1c606 100644
--- a/cpp/bindings/qpid/perl/t/Duration.t
+++ b/qpid/cpp/bindings/qpid/perl/t/Duration.t
diff --git a/cpp/bindings/qpid/perl/t/Message.t b/qpid/cpp/bindings/qpid/perl/t/Message.t
index a17c1121c8..a17c1121c8 100644
--- a/cpp/bindings/qpid/perl/t/Message.t
+++ b/qpid/cpp/bindings/qpid/perl/t/Message.t
diff --git a/cpp/bindings/qpid/perl/t/utils.pm b/qpid/cpp/bindings/qpid/perl/t/utils.pm
index db8093d324..db8093d324 100644
--- a/cpp/bindings/qpid/perl/t/utils.pm
+++ b/qpid/cpp/bindings/qpid/perl/t/utils.pm
diff --git a/cpp/bindings/qpid/python/CMakeLists.txt b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
index ac1998b18f..ac1998b18f 100644
--- a/cpp/bindings/qpid/python/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/python/CMakeLists.txt
diff --git a/cpp/bindings/qpid/python/ChangeLog b/qpid/cpp/bindings/qpid/python/ChangeLog
index ff6704cdd6..ff6704cdd6 100644
--- a/cpp/bindings/qpid/python/ChangeLog
+++ b/qpid/cpp/bindings/qpid/python/ChangeLog
diff --git a/cpp/bindings/qpid/python/LICENSE b/qpid/cpp/bindings/qpid/python/LICENSE
index bc46b77047..bc46b77047 100644
--- a/cpp/bindings/qpid/python/LICENSE
+++ b/qpid/cpp/bindings/qpid/python/LICENSE
diff --git a/cpp/bindings/qpid/python/README b/qpid/cpp/bindings/qpid/python/README
index eae32cd8ab..eae32cd8ab 100644
--- a/cpp/bindings/qpid/python/README
+++ b/qpid/cpp/bindings/qpid/python/README
diff --git a/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt b/qpid/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt
index 8ddd7869ae..8ddd7869ae 100644
--- a/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/python/extra_dist/CMakeLists.txt
diff --git a/cpp/bindings/qpid/python/qpid_messaging.i b/qpid/cpp/bindings/qpid/python/qpid_messaging.i
index 513cc531ae..513cc531ae 100644
--- a/cpp/bindings/qpid/python/qpid_messaging.i
+++ b/qpid/cpp/bindings/qpid/python/qpid_messaging.i
diff --git a/cpp/bindings/qpid/ruby/.gitignore b/qpid/cpp/bindings/qpid/ruby/.gitignore
index 769576fafd..769576fafd 100644
--- a/cpp/bindings/qpid/ruby/.gitignore
+++ b/qpid/cpp/bindings/qpid/ruby/.gitignore
diff --git a/cpp/bindings/qpid/ruby/CMakeLists.txt b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
index c31b4d4cde..c31b4d4cde 100644
--- a/cpp/bindings/qpid/ruby/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
diff --git a/cpp/bindings/qpid/ruby/ChangeLog b/qpid/cpp/bindings/qpid/ruby/ChangeLog
index 5eca9644d3..5eca9644d3 100644
--- a/cpp/bindings/qpid/ruby/ChangeLog
+++ b/qpid/cpp/bindings/qpid/ruby/ChangeLog
diff --git a/cpp/bindings/qpid/ruby/LICENSE b/qpid/cpp/bindings/qpid/ruby/LICENSE
index 261eeb9e9f..261eeb9e9f 100644
--- a/cpp/bindings/qpid/ruby/LICENSE
+++ b/qpid/cpp/bindings/qpid/ruby/LICENSE
diff --git a/cpp/bindings/qpid/ruby/README.rdoc b/qpid/cpp/bindings/qpid/ruby/README.rdoc
index fce87ac3e1..fce87ac3e1 100644
--- a/cpp/bindings/qpid/ruby/README.rdoc
+++ b/qpid/cpp/bindings/qpid/ruby/README.rdoc
diff --git a/cpp/bindings/qpid/ruby/TODO b/qpid/cpp/bindings/qpid/ruby/TODO
index db2aca0195..db2aca0195 100644
--- a/cpp/bindings/qpid/ruby/TODO
+++ b/qpid/cpp/bindings/qpid/ruby/TODO
diff --git a/cpp/bindings/qpid/ruby/examples/client.rb b/qpid/cpp/bindings/qpid/ruby/examples/client.rb
index 9e22bade0d..9e22bade0d 100644
--- a/cpp/bindings/qpid/ruby/examples/client.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/client.rb
diff --git a/cpp/bindings/qpid/ruby/examples/drain.rb b/qpid/cpp/bindings/qpid/ruby/examples/drain.rb
index 6bf3d93c36..6bf3d93c36 100644
--- a/cpp/bindings/qpid/ruby/examples/drain.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/drain.rb
diff --git a/cpp/bindings/qpid/ruby/examples/hello_world.rb b/qpid/cpp/bindings/qpid/ruby/examples/hello_world.rb
index 1928d55408..1928d55408 100644
--- a/cpp/bindings/qpid/ruby/examples/hello_world.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/hello_world.rb
diff --git a/cpp/bindings/qpid/ruby/examples/map_receiver.rb b/qpid/cpp/bindings/qpid/ruby/examples/map_receiver.rb
index 9ff5f7eea0..9ff5f7eea0 100644
--- a/cpp/bindings/qpid/ruby/examples/map_receiver.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/map_receiver.rb
diff --git a/cpp/bindings/qpid/ruby/examples/map_sender.rb b/qpid/cpp/bindings/qpid/ruby/examples/map_sender.rb
index f876bc5560..f876bc5560 100644
--- a/cpp/bindings/qpid/ruby/examples/map_sender.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/map_sender.rb
diff --git a/cpp/bindings/qpid/ruby/examples/server.rb b/qpid/cpp/bindings/qpid/ruby/examples/server.rb
index 8b21cb033b..8b21cb033b 100644
--- a/cpp/bindings/qpid/ruby/examples/server.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/server.rb
diff --git a/cpp/bindings/qpid/ruby/examples/spout.rb b/qpid/cpp/bindings/qpid/ruby/examples/spout.rb
index fbab69f6a8..fbab69f6a8 100644
--- a/cpp/bindings/qpid/ruby/examples/spout.rb
+++ b/qpid/cpp/bindings/qpid/ruby/examples/spout.rb
diff --git a/cpp/bindings/qpid/ruby/ext/cqpid/extconf.rb b/qpid/cpp/bindings/qpid/ruby/ext/cqpid/extconf.rb
index 27cb41af3c..27cb41af3c 100644
--- a/cpp/bindings/qpid/ruby/ext/cqpid/extconf.rb
+++ b/qpid/cpp/bindings/qpid/ruby/ext/cqpid/extconf.rb
diff --git a/cpp/bindings/qpid/ruby/features/closing_a_connection.feature b/qpid/cpp/bindings/qpid/ruby/features/closing_a_connection.feature
index b5cb92b5ea..b5cb92b5ea 100644
--- a/cpp/bindings/qpid/ruby/features/closing_a_connection.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/closing_a_connection.feature
diff --git a/cpp/bindings/qpid/ruby/features/closing_a_session.feature b/qpid/cpp/bindings/qpid/ruby/features/closing_a_session.feature
index 37b3f51df1..37b3f51df1 100644
--- a/cpp/bindings/qpid/ruby/features/closing_a_session.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/closing_a_session.feature
diff --git a/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature b/qpid/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature
index 3c7917b8b5..3c7917b8b5 100644
--- a/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/connecting_to_a_broker.feature
diff --git a/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature b/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
index 2dd5fe33f2..2dd5fe33f2 100644
--- a/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/creating_a_receiver.feature
diff --git a/cpp/bindings/qpid/ruby/features/creating_a_sender.feature b/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
index d603f1749a..d603f1749a 100644
--- a/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/creating_a_sender.feature
diff --git a/cpp/bindings/qpid/ruby/features/creating_a_session.feature b/qpid/cpp/bindings/qpid/ruby/features/creating_a_session.feature
index 257d85ee7a..257d85ee7a 100644
--- a/cpp/bindings/qpid/ruby/features/creating_a_session.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/creating_a_session.feature
diff --git a/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature b/qpid/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature
index 783faafa67..783faafa67 100644
--- a/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/getting_the_connections_authenticated_username.feature
diff --git a/cpp/bindings/qpid/ruby/features/receiving_a_message.feature b/qpid/cpp/bindings/qpid/ruby/features/receiving_a_message.feature
index 6386afb79d..6386afb79d 100644
--- a/cpp/bindings/qpid/ruby/features/receiving_a_message.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/receiving_a_message.feature
diff --git a/cpp/bindings/qpid/ruby/features/sending_a_message.feature b/qpid/cpp/bindings/qpid/ruby/features/sending_a_message.feature
index d6e6a9464e..d6e6a9464e 100644
--- a/cpp/bindings/qpid/ruby/features/sending_a_message.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/sending_a_message.feature
diff --git a/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature b/qpid/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature
index 58cb0aa0b9..58cb0aa0b9 100644
--- a/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/session_returns_its_connection.feature
diff --git a/cpp/bindings/qpid/ruby/features/sessions_have_names.feature b/qpid/cpp/bindings/qpid/ruby/features/sessions_have_names.feature
index 58a5771c9f..58a5771c9f 100644
--- a/cpp/bindings/qpid/ruby/features/sessions_have_names.feature
+++ b/qpid/cpp/bindings/qpid/ruby/features/sessions_have_names.feature
diff --git a/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb
index a7eca6f9ce..a7eca6f9ce 100644
--- a/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/address_steps.rb
diff --git a/cpp/bindings/qpid/ruby/features/step_definitions/connection_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/connection_steps.rb
index 3fe3e6941f..3fe3e6941f 100644
--- a/cpp/bindings/qpid/ruby/features/step_definitions/connection_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/connection_steps.rb
diff --git a/cpp/bindings/qpid/ruby/features/step_definitions/receiver_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/receiver_steps.rb
index e454dac345..e454dac345 100644
--- a/cpp/bindings/qpid/ruby/features/step_definitions/receiver_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/receiver_steps.rb
diff --git a/cpp/bindings/qpid/ruby/features/step_definitions/sender_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/sender_steps.rb
index 93dbd2d5c0..93dbd2d5c0 100644
--- a/cpp/bindings/qpid/ruby/features/step_definitions/sender_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/sender_steps.rb
diff --git a/cpp/bindings/qpid/ruby/features/step_definitions/session_steps.rb b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/session_steps.rb
index cf775d917d..cf775d917d 100644
--- a/cpp/bindings/qpid/ruby/features/step_definitions/session_steps.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/step_definitions/session_steps.rb
diff --git a/cpp/bindings/qpid/ruby/features/support/env.rb b/qpid/cpp/bindings/qpid/ruby/features/support/env.rb
index cc0097ca8b..cc0097ca8b 100644
--- a/cpp/bindings/qpid/ruby/features/support/env.rb
+++ b/qpid/cpp/bindings/qpid/ruby/features/support/env.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging.rb
index 2b5348f298..2b5348f298 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
index 0879f0fcd1..0879f0fcd1 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/address.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb
index 6d637a1665..6d637a1665 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/connection.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb
index 11c903dade..11c903dade 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/duration.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb
index ac0fbc32a7..ac0fbc32a7 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/encoding.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
index 58205bdcbc..58205bdcbc 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/message.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb
index 05ee925212..05ee925212 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/receiver.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb
index 4ce1393dc7..4ce1393dc7 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/sender.rb
diff --git a/cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb
index 7e6e11f654..7e6e11f654 100644
--- a/cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb
+++ b/qpid/cpp/bindings/qpid/ruby/lib/qpid_messaging/session.rb
diff --git a/cpp/bindings/qpid/ruby/qpid_messaging.gemspec b/qpid/cpp/bindings/qpid/ruby/qpid_messaging.gemspec
index fe22f821d3..fe22f821d3 100644
--- a/cpp/bindings/qpid/ruby/qpid_messaging.gemspec
+++ b/qpid/cpp/bindings/qpid/ruby/qpid_messaging.gemspec
diff --git a/cpp/bindings/qpid/ruby/ruby.i b/qpid/cpp/bindings/qpid/ruby/ruby.i
index 30384aad9f..30384aad9f 100644
--- a/cpp/bindings/qpid/ruby/ruby.i
+++ b/qpid/cpp/bindings/qpid/ruby/ruby.i
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/address_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/address_spec.rb
index 05c97ddf30..05c97ddf30 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/address_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/address_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/connection_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/connection_spec.rb
index 50038a0fc0..50038a0fc0 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/connection_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/connection_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/duration_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/duration_spec.rb
index 202332d232..202332d232 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/duration_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/duration_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/encoding_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/encoding_spec.rb
index 58b8447278..58b8447278 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/encoding_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/encoding_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/message_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/message_spec.rb
index 3581174548..3581174548 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/message_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/message_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/receiver_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/receiver_spec.rb
index 81ae935dcb..81ae935dcb 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/receiver_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/receiver_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/sender_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/sender_spec.rb
index fa3a2a5b1f..fa3a2a5b1f 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/sender_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/sender_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/qpid_messaging/session_spec.rb b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/session_spec.rb
index cb1e94a72f..cb1e94a72f 100644
--- a/cpp/bindings/qpid/ruby/spec/qpid_messaging/session_spec.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/qpid_messaging/session_spec.rb
diff --git a/cpp/bindings/qpid/ruby/spec/spec_helper.rb b/qpid/cpp/bindings/qpid/ruby/spec/spec_helper.rb
index cf1b3b25f9..cf1b3b25f9 100644
--- a/cpp/bindings/qpid/ruby/spec/spec_helper.rb
+++ b/qpid/cpp/bindings/qpid/ruby/spec/spec_helper.rb
diff --git a/cpp/bld-winsdk.ps1 b/qpid/cpp/bld-winsdk.ps1
index 1a6727fc07..1a6727fc07 100644
--- a/cpp/bld-winsdk.ps1
+++ b/qpid/cpp/bld-winsdk.ps1
diff --git a/cpp/cmake_uninstall.cmake.in b/qpid/cpp/cmake_uninstall.cmake.in
index 02244f32e7..02244f32e7 100644
--- a/cpp/cmake_uninstall.cmake.in
+++ b/qpid/cpp/cmake_uninstall.cmake.in
diff --git a/cpp/design_docs/broker-acl-work.txt b/qpid/cpp/design_docs/broker-acl-work.txt
index e587dc5198..e587dc5198 100644
--- a/cpp/design_docs/broker-acl-work.txt
+++ b/qpid/cpp/design_docs/broker-acl-work.txt
diff --git a/cpp/design_docs/ha-transactions.md b/qpid/cpp/design_docs/ha-transactions.md
index bfa5456a2c..bfa5456a2c 100644
--- a/cpp/design_docs/ha-transactions.md
+++ b/qpid/cpp/design_docs/ha-transactions.md
diff --git a/cpp/design_docs/log-model-category-for-correlation.txt b/qpid/cpp/design_docs/log-model-category-for-correlation.txt
index 280f53bb9d..280f53bb9d 100644
--- a/cpp/design_docs/log-model-category-for-correlation.txt
+++ b/qpid/cpp/design_docs/log-model-category-for-correlation.txt
diff --git a/cpp/design_docs/new-ha-design.txt b/qpid/cpp/design_docs/new-ha-design.txt
index df6c7242eb..df6c7242eb 100644
--- a/cpp/design_docs/new-ha-design.txt
+++ b/qpid/cpp/design_docs/new-ha-design.txt
diff --git a/cpp/design_docs/old-cluster-issues.txt b/qpid/cpp/design_docs/old-cluster-issues.txt
index c552a67c9a..c552a67c9a 100644
--- a/cpp/design_docs/old-cluster-issues.txt
+++ b/qpid/cpp/design_docs/old-cluster-issues.txt
diff --git a/cpp/design_docs/windows_clfs_store_design.txt b/qpid/cpp/design_docs/windows_clfs_store_design.txt
index 944d957083..944d957083 100644
--- a/cpp/design_docs/windows_clfs_store_design.txt
+++ b/qpid/cpp/design_docs/windows_clfs_store_design.txt
diff --git a/cpp/docs/api/CMakeLists.txt b/qpid/cpp/docs/api/CMakeLists.txt
index 79e0d58db5..79e0d58db5 100644
--- a/cpp/docs/api/CMakeLists.txt
+++ b/qpid/cpp/docs/api/CMakeLists.txt
diff --git a/cpp/docs/api/developer.doxygen.in b/qpid/cpp/docs/api/developer.doxygen.in
index 1e1fddab80..1e1fddab80 100644
--- a/cpp/docs/api/developer.doxygen.in
+++ b/qpid/cpp/docs/api/developer.doxygen.in
diff --git a/cpp/docs/api/doxygen.css b/qpid/cpp/docs/api/doxygen.css
index 3292768f0c..3292768f0c 100644
--- a/cpp/docs/api/doxygen.css
+++ b/qpid/cpp/docs/api/doxygen.css
diff --git a/cpp/docs/api/doxygen_developer_mainpage.h b/qpid/cpp/docs/api/doxygen_developer_mainpage.h
index 81b61ec728..81b61ec728 100644
--- a/cpp/docs/api/doxygen_developer_mainpage.h
+++ b/qpid/cpp/docs/api/doxygen_developer_mainpage.h
diff --git a/cpp/docs/api/doxygen_mainpage.h b/qpid/cpp/docs/api/doxygen_mainpage.h
index 9acae52da4..9acae52da4 100644
--- a/cpp/docs/api/doxygen_mainpage.h
+++ b/qpid/cpp/docs/api/doxygen_mainpage.h
diff --git a/cpp/docs/api/footer.html b/qpid/cpp/docs/api/footer.html
index 5a31e81821..5a31e81821 100644
--- a/cpp/docs/api/footer.html
+++ b/qpid/cpp/docs/api/footer.html
diff --git a/cpp/docs/api/header.html b/qpid/cpp/docs/api/header.html
index d2faa02984..d2faa02984 100644
--- a/cpp/docs/api/header.html
+++ b/qpid/cpp/docs/api/header.html
diff --git a/cpp/docs/api/stylesheet.css b/qpid/cpp/docs/api/stylesheet.css
index 3292768f0c..3292768f0c 100644
--- a/cpp/docs/api/stylesheet.css
+++ b/qpid/cpp/docs/api/stylesheet.css
diff --git a/cpp/docs/api/tabs.css b/qpid/cpp/docs/api/tabs.css
index 56f0e04564..56f0e04564 100644
--- a/cpp/docs/api/tabs.css
+++ b/qpid/cpp/docs/api/tabs.css
diff --git a/cpp/docs/api/user.doxygen.in b/qpid/cpp/docs/api/user.doxygen.in
index ec0fd1361c..ec0fd1361c 100644
--- a/cpp/docs/api/user.doxygen.in
+++ b/qpid/cpp/docs/api/user.doxygen.in
diff --git a/cpp/docs/man/CMakeLists.txt b/qpid/cpp/docs/man/CMakeLists.txt
index fe94dc25f2..fe94dc25f2 100644
--- a/cpp/docs/man/CMakeLists.txt
+++ b/qpid/cpp/docs/man/CMakeLists.txt
diff --git a/cpp/docs/man/generate_manpage b/qpid/cpp/docs/man/generate_manpage
index 2d6c1461ba..2d6c1461ba 100755
--- a/cpp/docs/man/generate_manpage
+++ b/qpid/cpp/docs/man/generate_manpage
diff --git a/cpp/docs/man/groffify_options.sed b/qpid/cpp/docs/man/groffify_options.sed
index c0f295eb47..c0f295eb47 100644
--- a/cpp/docs/man/groffify_options.sed
+++ b/qpid/cpp/docs/man/groffify_options.sed
diff --git a/cpp/docs/man/groffify_template.sed b/qpid/cpp/docs/man/groffify_template.sed
index 74aaed3a5d..74aaed3a5d 100644
--- a/cpp/docs/man/groffify_template.sed
+++ b/qpid/cpp/docs/man/groffify_template.sed
diff --git a/cpp/docs/man/qpidd.1 b/qpid/cpp/docs/man/qpidd.1
index ad47fedba6..ad47fedba6 100644
--- a/cpp/docs/man/qpidd.1
+++ b/qpid/cpp/docs/man/qpidd.1
diff --git a/cpp/docs/man/qpidd.x b/qpid/cpp/docs/man/qpidd.x
index 6efa5f3051..6efa5f3051 100644
--- a/cpp/docs/man/qpidd.x
+++ b/qpid/cpp/docs/man/qpidd.x
diff --git a/cpp/docs/src/CONTENTS b/qpid/cpp/docs/src/CONTENTS
index cc3b868e0e..cc3b868e0e 100644
--- a/cpp/docs/src/CONTENTS
+++ b/qpid/cpp/docs/src/CONTENTS
diff --git a/cpp/docs/src/DispatchHandle.odg b/qpid/cpp/docs/src/DispatchHandle.odg
index c08b3a4e1a..c08b3a4e1a 100644
--- a/cpp/docs/src/DispatchHandle.odg
+++ b/qpid/cpp/docs/src/DispatchHandle.odg
diff --git a/cpp/etc/CMakeLists.txt b/qpid/cpp/etc/CMakeLists.txt
index c39257e6cc..c39257e6cc 100644
--- a/cpp/etc/CMakeLists.txt
+++ b/qpid/cpp/etc/CMakeLists.txt
diff --git a/cpp/etc/cluster.conf-example.xml.in b/qpid/cpp/etc/cluster.conf-example.xml.in
index d6f0c082af..d6f0c082af 100644
--- a/cpp/etc/cluster.conf-example.xml.in
+++ b/qpid/cpp/etc/cluster.conf-example.xml.in
diff --git a/cpp/etc/emacs/qpid-c++-mode.el b/qpid/cpp/etc/emacs/qpid-c++-mode.el
index ed1b4aa44b..ed1b4aa44b 100644
--- a/cpp/etc/emacs/qpid-c++-mode.el
+++ b/qpid/cpp/etc/emacs/qpid-c++-mode.el
diff --git a/cpp/etc/qpidc.conf b/qpid/cpp/etc/qpidc.conf
index 36dcbb3183..36dcbb3183 100644
--- a/cpp/etc/qpidc.conf
+++ b/qpid/cpp/etc/qpidc.conf
diff --git a/cpp/etc/qpidd-primary.in b/qpid/cpp/etc/qpidd-primary.in
index 86bc76d5e1..86bc76d5e1 100755
--- a/cpp/etc/qpidd-primary.in
+++ b/qpid/cpp/etc/qpidd-primary.in
diff --git a/cpp/etc/qpidd.conf b/qpid/cpp/etc/qpidd.conf
index 0f78f49750..0f78f49750 100644
--- a/cpp/etc/qpidd.conf
+++ b/qpid/cpp/etc/qpidd.conf
diff --git a/cpp/etc/qpidd.in b/qpid/cpp/etc/qpidd.in
index d363308c7f..d363308c7f 100755
--- a/cpp/etc/qpidd.in
+++ b/qpid/cpp/etc/qpidd.in
diff --git a/cpp/etc/sasl2/qpidd.conf b/qpid/cpp/etc/sasl2/qpidd.conf
index 3d13a6d650..3d13a6d650 100644
--- a/cpp/etc/sasl2/qpidd.conf
+++ b/qpid/cpp/etc/sasl2/qpidd.conf
diff --git a/cpp/etc/selinux/.gitignore b/qpid/cpp/etc/selinux/.gitignore
index aca772170b..aca772170b 100644
--- a/cpp/etc/selinux/.gitignore
+++ b/qpid/cpp/etc/selinux/.gitignore
diff --git a/cpp/etc/selinux/qpidd.te b/qpid/cpp/etc/selinux/qpidd.te
index 52b8e29509..52b8e29509 100644
--- a/cpp/etc/selinux/qpidd.te
+++ b/qpid/cpp/etc/selinux/qpidd.te
diff --git a/cpp/etc/selinux/qpiddevel.te b/qpid/cpp/etc/selinux/qpiddevel.te
index 10c5dfc880..10c5dfc880 100644
--- a/cpp/etc/selinux/qpiddevel.te
+++ b/qpid/cpp/etc/selinux/qpiddevel.te
diff --git a/cpp/examples/CMakeLists.txt b/qpid/cpp/examples/CMakeLists.txt
index 7b0e61e3df..7b0e61e3df 100644
--- a/cpp/examples/CMakeLists.txt
+++ b/qpid/cpp/examples/CMakeLists.txt
diff --git a/cpp/examples/README.txt b/qpid/cpp/examples/README.txt
index 74de2788c3..74de2788c3 100644
--- a/cpp/examples/README.txt
+++ b/qpid/cpp/examples/README.txt
diff --git a/cpp/examples/examples.sln b/qpid/cpp/examples/examples.sln
index 8511fe3cce..8511fe3cce 100644
--- a/cpp/examples/examples.sln
+++ b/qpid/cpp/examples/examples.sln
diff --git a/cpp/examples/messaging/CMakeLists.txt b/qpid/cpp/examples/messaging/CMakeLists.txt
index 40f9412189..40f9412189 100644
--- a/cpp/examples/messaging/CMakeLists.txt
+++ b/qpid/cpp/examples/messaging/CMakeLists.txt
diff --git a/cpp/examples/messaging/OptionParser.cpp b/qpid/cpp/examples/messaging/OptionParser.cpp
index 661d0a988a..661d0a988a 100644
--- a/cpp/examples/messaging/OptionParser.cpp
+++ b/qpid/cpp/examples/messaging/OptionParser.cpp
diff --git a/cpp/examples/messaging/OptionParser.h b/qpid/cpp/examples/messaging/OptionParser.h
index 4cda53f92a..4cda53f92a 100644
--- a/cpp/examples/messaging/OptionParser.h
+++ b/qpid/cpp/examples/messaging/OptionParser.h
diff --git a/cpp/examples/messaging/client.cpp b/qpid/cpp/examples/messaging/client.cpp
index 44720ef3ce..44720ef3ce 100644
--- a/cpp/examples/messaging/client.cpp
+++ b/qpid/cpp/examples/messaging/client.cpp
diff --git a/cpp/examples/messaging/drain.cpp b/qpid/cpp/examples/messaging/drain.cpp
index 0c58cc25e6..0c58cc25e6 100644
--- a/cpp/examples/messaging/drain.cpp
+++ b/qpid/cpp/examples/messaging/drain.cpp
diff --git a/cpp/examples/messaging/extra_dist/CMakeLists.txt b/qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt
index be44adaedb..be44adaedb 100644
--- a/cpp/examples/messaging/extra_dist/CMakeLists.txt
+++ b/qpid/cpp/examples/messaging/extra_dist/CMakeLists.txt
diff --git a/cpp/examples/messaging/hello_world.cpp b/qpid/cpp/examples/messaging/hello_world.cpp
index a868a64b5e..a868a64b5e 100644
--- a/cpp/examples/messaging/hello_world.cpp
+++ b/qpid/cpp/examples/messaging/hello_world.cpp
diff --git a/cpp/examples/messaging/hello_xml.cpp b/qpid/cpp/examples/messaging/hello_xml.cpp
index 00e1b6c8e1..00e1b6c8e1 100644
--- a/cpp/examples/messaging/hello_xml.cpp
+++ b/qpid/cpp/examples/messaging/hello_xml.cpp
diff --git a/cpp/examples/messaging/map_receiver.cpp b/qpid/cpp/examples/messaging/map_receiver.cpp
index 96bc76b821..96bc76b821 100644
--- a/cpp/examples/messaging/map_receiver.cpp
+++ b/qpid/cpp/examples/messaging/map_receiver.cpp
diff --git a/cpp/examples/messaging/map_sender.cpp b/qpid/cpp/examples/messaging/map_sender.cpp
index 81ac7320d8..81ac7320d8 100644
--- a/cpp/examples/messaging/map_sender.cpp
+++ b/qpid/cpp/examples/messaging/map_sender.cpp
diff --git a/cpp/examples/messaging/messaging_client.vcproj b/qpid/cpp/examples/messaging/messaging_client.vcproj
index ff66891855..ff66891855 100644
--- a/cpp/examples/messaging/messaging_client.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_client.vcproj
diff --git a/cpp/examples/messaging/messaging_drain.vcproj b/qpid/cpp/examples/messaging/messaging_drain.vcproj
index 3fc0ebe3f8..3fc0ebe3f8 100644
--- a/cpp/examples/messaging/messaging_drain.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_drain.vcproj
diff --git a/cpp/examples/messaging/messaging_map_receiver.vcproj b/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj
index 9242156ae9..9242156ae9 100644
--- a/cpp/examples/messaging/messaging_map_receiver.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_map_receiver.vcproj
diff --git a/cpp/examples/messaging/messaging_map_sender.vcproj b/qpid/cpp/examples/messaging/messaging_map_sender.vcproj
index b68d88f97c..b68d88f97c 100644
--- a/cpp/examples/messaging/messaging_map_sender.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_map_sender.vcproj
diff --git a/cpp/examples/messaging/messaging_server.vcproj b/qpid/cpp/examples/messaging/messaging_server.vcproj
index 7050f8b9e1..7050f8b9e1 100644
--- a/cpp/examples/messaging/messaging_server.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_server.vcproj
diff --git a/cpp/examples/messaging/messaging_server_reconnect.vcproj b/qpid/cpp/examples/messaging/messaging_server_reconnect.vcproj
index dfde201178..dfde201178 100644
--- a/cpp/examples/messaging/messaging_server_reconnect.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_server_reconnect.vcproj
diff --git a/cpp/examples/messaging/messaging_spout.vcproj b/qpid/cpp/examples/messaging/messaging_spout.vcproj
index 79043b8958..79043b8958 100644
--- a/cpp/examples/messaging/messaging_spout.vcproj
+++ b/qpid/cpp/examples/messaging/messaging_spout.vcproj
diff --git a/cpp/examples/messaging/readme.txt b/qpid/cpp/examples/messaging/readme.txt
index ff145e0160..ff145e0160 100644
--- a/cpp/examples/messaging/readme.txt
+++ b/qpid/cpp/examples/messaging/readme.txt
diff --git a/cpp/examples/messaging/server.cpp b/qpid/cpp/examples/messaging/server.cpp
index ba9fa9e063..ba9fa9e063 100644
--- a/cpp/examples/messaging/server.cpp
+++ b/qpid/cpp/examples/messaging/server.cpp
diff --git a/cpp/examples/messaging/server_reconnect.cpp b/qpid/cpp/examples/messaging/server_reconnect.cpp
index ab7147760f..ab7147760f 100644
--- a/cpp/examples/messaging/server_reconnect.cpp
+++ b/qpid/cpp/examples/messaging/server_reconnect.cpp
diff --git a/cpp/examples/messaging/spout.cpp b/qpid/cpp/examples/messaging/spout.cpp
index d11bb8bd03..d11bb8bd03 100644
--- a/cpp/examples/messaging/spout.cpp
+++ b/qpid/cpp/examples/messaging/spout.cpp
diff --git a/cpp/examples/winsdk-cmake/CMakeLists.txt b/qpid/cpp/examples/winsdk-cmake/CMakeLists.txt
index 6f089625ca..6f089625ca 100644
--- a/cpp/examples/winsdk-cmake/CMakeLists.txt
+++ b/qpid/cpp/examples/winsdk-cmake/CMakeLists.txt
diff --git a/cpp/include/qmf/Agent.h b/qpid/cpp/include/qmf/Agent.h
index 457b1495de..457b1495de 100644
--- a/cpp/include/qmf/Agent.h
+++ b/qpid/cpp/include/qmf/Agent.h
diff --git a/cpp/include/qmf/AgentEvent.h b/qpid/cpp/include/qmf/AgentEvent.h
index b3f4bfaa9b..b3f4bfaa9b 100644
--- a/cpp/include/qmf/AgentEvent.h
+++ b/qpid/cpp/include/qmf/AgentEvent.h
diff --git a/cpp/include/qmf/AgentSession.h b/qpid/cpp/include/qmf/AgentSession.h
index 25778f0198..25778f0198 100644
--- a/cpp/include/qmf/AgentSession.h
+++ b/qpid/cpp/include/qmf/AgentSession.h
diff --git a/cpp/include/qmf/BrokerImportExport.h b/qpid/cpp/include/qmf/BrokerImportExport.h
index ee05788063..ee05788063 100644
--- a/cpp/include/qmf/BrokerImportExport.h
+++ b/qpid/cpp/include/qmf/BrokerImportExport.h
diff --git a/cpp/include/qmf/ConsoleEvent.h b/qpid/cpp/include/qmf/ConsoleEvent.h
index 1419b45de0..1419b45de0 100644
--- a/cpp/include/qmf/ConsoleEvent.h
+++ b/qpid/cpp/include/qmf/ConsoleEvent.h
diff --git a/cpp/include/qmf/ConsoleSession.h b/qpid/cpp/include/qmf/ConsoleSession.h
index 8d34032b1f..8d34032b1f 100644
--- a/cpp/include/qmf/ConsoleSession.h
+++ b/qpid/cpp/include/qmf/ConsoleSession.h
diff --git a/cpp/include/qmf/Data.h b/qpid/cpp/include/qmf/Data.h
index 5067c3432a..5067c3432a 100644
--- a/cpp/include/qmf/Data.h
+++ b/qpid/cpp/include/qmf/Data.h
diff --git a/cpp/include/qmf/DataAddr.h b/qpid/cpp/include/qmf/DataAddr.h
index 7964f1cd02..7964f1cd02 100644
--- a/cpp/include/qmf/DataAddr.h
+++ b/qpid/cpp/include/qmf/DataAddr.h
diff --git a/cpp/include/qmf/Handle.h b/qpid/cpp/include/qmf/Handle.h
index b0715a2145..b0715a2145 100644
--- a/cpp/include/qmf/Handle.h
+++ b/qpid/cpp/include/qmf/Handle.h
diff --git a/cpp/include/qmf/ImportExport.h b/qpid/cpp/include/qmf/ImportExport.h
index 7405c15259..7405c15259 100644
--- a/cpp/include/qmf/ImportExport.h
+++ b/qpid/cpp/include/qmf/ImportExport.h
diff --git a/cpp/include/qmf/Query.h b/qpid/cpp/include/qmf/Query.h
index dbd28c12de..dbd28c12de 100644
--- a/cpp/include/qmf/Query.h
+++ b/qpid/cpp/include/qmf/Query.h
diff --git a/cpp/include/qmf/Schema.h b/qpid/cpp/include/qmf/Schema.h
index 836eb271bd..836eb271bd 100644
--- a/cpp/include/qmf/Schema.h
+++ b/qpid/cpp/include/qmf/Schema.h
diff --git a/cpp/include/qmf/SchemaId.h b/qpid/cpp/include/qmf/SchemaId.h
index 7d074c93de..7d074c93de 100644
--- a/cpp/include/qmf/SchemaId.h
+++ b/qpid/cpp/include/qmf/SchemaId.h
diff --git a/cpp/include/qmf/SchemaMethod.h b/qpid/cpp/include/qmf/SchemaMethod.h
index 66b2be2300..66b2be2300 100644
--- a/cpp/include/qmf/SchemaMethod.h
+++ b/qpid/cpp/include/qmf/SchemaMethod.h
diff --git a/cpp/include/qmf/SchemaProperty.h b/qpid/cpp/include/qmf/SchemaProperty.h
index cb2dec8d2c..cb2dec8d2c 100644
--- a/cpp/include/qmf/SchemaProperty.h
+++ b/qpid/cpp/include/qmf/SchemaProperty.h
diff --git a/cpp/include/qmf/SchemaTypes.h b/qpid/cpp/include/qmf/SchemaTypes.h
index b44d32a157..b44d32a157 100644
--- a/cpp/include/qmf/SchemaTypes.h
+++ b/qpid/cpp/include/qmf/SchemaTypes.h
diff --git a/cpp/include/qmf/Subscription.h b/qpid/cpp/include/qmf/Subscription.h
index adda2a75ab..adda2a75ab 100644
--- a/cpp/include/qmf/Subscription.h
+++ b/qpid/cpp/include/qmf/Subscription.h
diff --git a/cpp/include/qmf/exceptions.h b/qpid/cpp/include/qmf/exceptions.h
index 1a2e5dd2e8..1a2e5dd2e8 100644
--- a/cpp/include/qmf/exceptions.h
+++ b/qpid/cpp/include/qmf/exceptions.h
diff --git a/cpp/include/qmf/posix/EventNotifier.h b/qpid/cpp/include/qmf/posix/EventNotifier.h
index c95a95dddf..c95a95dddf 100644
--- a/cpp/include/qmf/posix/EventNotifier.h
+++ b/qpid/cpp/include/qmf/posix/EventNotifier.h
diff --git a/cpp/include/qmf/qmf2.i b/qpid/cpp/include/qmf/qmf2.i
index 7c54197f6d..7c54197f6d 100644
--- a/cpp/include/qmf/qmf2.i
+++ b/qpid/cpp/include/qmf/qmf2.i
diff --git a/cpp/include/qpid/ImportExport.h b/qpid/cpp/include/qpid/ImportExport.h
index eecc9503bc..eecc9503bc 100644
--- a/cpp/include/qpid/ImportExport.h
+++ b/qpid/cpp/include/qpid/ImportExport.h
diff --git a/cpp/include/qpid/messaging/Address.h b/qpid/cpp/include/qpid/messaging/Address.h
index 224a70b193..224a70b193 100644
--- a/cpp/include/qpid/messaging/Address.h
+++ b/qpid/cpp/include/qpid/messaging/Address.h
diff --git a/cpp/include/qpid/messaging/Connection.h b/qpid/cpp/include/qpid/messaging/Connection.h
index aed3717fa8..aed3717fa8 100644
--- a/cpp/include/qpid/messaging/Connection.h
+++ b/qpid/cpp/include/qpid/messaging/Connection.h
diff --git a/cpp/include/qpid/messaging/Duration.h b/qpid/cpp/include/qpid/messaging/Duration.h
index 6b8f05c7c6..6b8f05c7c6 100644
--- a/cpp/include/qpid/messaging/Duration.h
+++ b/qpid/cpp/include/qpid/messaging/Duration.h
diff --git a/cpp/include/qpid/messaging/FailoverUpdates.h b/qpid/cpp/include/qpid/messaging/FailoverUpdates.h
index 6d7314620a..6d7314620a 100644
--- a/cpp/include/qpid/messaging/FailoverUpdates.h
+++ b/qpid/cpp/include/qpid/messaging/FailoverUpdates.h
diff --git a/cpp/include/qpid/messaging/Handle.h b/qpid/cpp/include/qpid/messaging/Handle.h
index 2edab26744..2edab26744 100644
--- a/cpp/include/qpid/messaging/Handle.h
+++ b/qpid/cpp/include/qpid/messaging/Handle.h
diff --git a/cpp/include/qpid/messaging/ImportExport.h b/qpid/cpp/include/qpid/messaging/ImportExport.h
index ab5f21f618..ab5f21f618 100644
--- a/cpp/include/qpid/messaging/ImportExport.h
+++ b/qpid/cpp/include/qpid/messaging/ImportExport.h
diff --git a/cpp/include/qpid/messaging/Logger.h b/qpid/cpp/include/qpid/messaging/Logger.h
index 39518e01d4..39518e01d4 100644
--- a/cpp/include/qpid/messaging/Logger.h
+++ b/qpid/cpp/include/qpid/messaging/Logger.h
diff --git a/cpp/include/qpid/messaging/Message.h b/qpid/cpp/include/qpid/messaging/Message.h
index 6315d3e86f..6315d3e86f 100644
--- a/cpp/include/qpid/messaging/Message.h
+++ b/qpid/cpp/include/qpid/messaging/Message.h
diff --git a/cpp/include/qpid/messaging/Message_io.h b/qpid/cpp/include/qpid/messaging/Message_io.h
index 810c44810c..810c44810c 100644
--- a/cpp/include/qpid/messaging/Message_io.h
+++ b/qpid/cpp/include/qpid/messaging/Message_io.h
diff --git a/cpp/include/qpid/messaging/Receiver.h b/qpid/cpp/include/qpid/messaging/Receiver.h
index 6c6fdaa7cb..6c6fdaa7cb 100644
--- a/cpp/include/qpid/messaging/Receiver.h
+++ b/qpid/cpp/include/qpid/messaging/Receiver.h
diff --git a/cpp/include/qpid/messaging/Sender.h b/qpid/cpp/include/qpid/messaging/Sender.h
index 9c7bca1905..9c7bca1905 100644
--- a/cpp/include/qpid/messaging/Sender.h
+++ b/qpid/cpp/include/qpid/messaging/Sender.h
diff --git a/cpp/include/qpid/messaging/Session.h b/qpid/cpp/include/qpid/messaging/Session.h
index 999af7c65b..999af7c65b 100644
--- a/cpp/include/qpid/messaging/Session.h
+++ b/qpid/cpp/include/qpid/messaging/Session.h
diff --git a/cpp/include/qpid/messaging/exceptions.h b/qpid/cpp/include/qpid/messaging/exceptions.h
index 04d4d818f7..04d4d818f7 100644
--- a/cpp/include/qpid/messaging/exceptions.h
+++ b/qpid/cpp/include/qpid/messaging/exceptions.h
diff --git a/cpp/include/qpid/qpid.i b/qpid/cpp/include/qpid/qpid.i
index 70f4ce8105..70f4ce8105 100644
--- a/cpp/include/qpid/qpid.i
+++ b/qpid/cpp/include/qpid/qpid.i
diff --git a/cpp/include/qpid/swig_perl_typemaps.i b/qpid/cpp/include/qpid/swig_perl_typemaps.i
index e1fa908f9f..e1fa908f9f 100644
--- a/cpp/include/qpid/swig_perl_typemaps.i
+++ b/qpid/cpp/include/qpid/swig_perl_typemaps.i
diff --git a/cpp/include/qpid/swig_python_typemaps.i b/qpid/cpp/include/qpid/swig_python_typemaps.i
index 52b0d978dc..52b0d978dc 100644
--- a/cpp/include/qpid/swig_python_typemaps.i
+++ b/qpid/cpp/include/qpid/swig_python_typemaps.i
diff --git a/cpp/include/qpid/swig_ruby_typemaps.i b/qpid/cpp/include/qpid/swig_ruby_typemaps.i
index 4e07088bce..4e07088bce 100644
--- a/cpp/include/qpid/swig_ruby_typemaps.i
+++ b/qpid/cpp/include/qpid/swig_ruby_typemaps.i
diff --git a/cpp/include/qpid/sys/IntegerTypes.h b/qpid/cpp/include/qpid/sys/IntegerTypes.h
index 75fa921de0..75fa921de0 100755
--- a/cpp/include/qpid/sys/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/IntegerTypes.h
diff --git a/cpp/include/qpid/sys/posix/IntegerTypes.h b/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
index ce97f7bde8..ce97f7bde8 100755
--- a/cpp/include/qpid/sys/posix/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
diff --git a/cpp/include/qpid/sys/windows/IntegerTypes.h b/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
index 28b82da1a0..28b82da1a0 100755
--- a/cpp/include/qpid/sys/windows/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
diff --git a/cpp/include/qpid/types/Exception.h b/qpid/cpp/include/qpid/types/Exception.h
index 483d104cc8..483d104cc8 100644
--- a/cpp/include/qpid/types/Exception.h
+++ b/qpid/cpp/include/qpid/types/Exception.h
diff --git a/cpp/include/qpid/types/ImportExport.h b/qpid/cpp/include/qpid/types/ImportExport.h
index 8fa41884fb..8fa41884fb 100644
--- a/cpp/include/qpid/types/ImportExport.h
+++ b/qpid/cpp/include/qpid/types/ImportExport.h
diff --git a/cpp/include/qpid/types/Uuid.h b/qpid/cpp/include/qpid/types/Uuid.h
index 6384103f43..6384103f43 100644
--- a/cpp/include/qpid/types/Uuid.h
+++ b/qpid/cpp/include/qpid/types/Uuid.h
diff --git a/cpp/include/qpid/types/Variant.h b/qpid/cpp/include/qpid/types/Variant.h
index 843870e438..843870e438 100644
--- a/cpp/include/qpid/types/Variant.h
+++ b/qpid/cpp/include/qpid/types/Variant.h
diff --git a/cpp/managementgen/CMakeLists.txt b/qpid/cpp/managementgen/CMakeLists.txt
index 4d1bbe18d9..4d1bbe18d9 100644
--- a/cpp/managementgen/CMakeLists.txt
+++ b/qpid/cpp/managementgen/CMakeLists.txt
diff --git a/cpp/managementgen/qmf-gen b/qpid/cpp/managementgen/qmf-gen
index fc2f284578..fc2f284578 100755
--- a/cpp/managementgen/qmf-gen
+++ b/qpid/cpp/managementgen/qmf-gen
diff --git a/cpp/managementgen/qmfgen/__init__.py b/qpid/cpp/managementgen/qmfgen/__init__.py
index 63a3f41f28..63a3f41f28 100644
--- a/cpp/managementgen/qmfgen/__init__.py
+++ b/qpid/cpp/managementgen/qmfgen/__init__.py
diff --git a/cpp/managementgen/qmfgen/generate.py b/qpid/cpp/managementgen/qmfgen/generate.py
index 22c53aa2e0..22c53aa2e0 100755
--- a/cpp/managementgen/qmfgen/generate.py
+++ b/qpid/cpp/managementgen/qmfgen/generate.py
diff --git a/cpp/managementgen/qmfgen/management-types.xml b/qpid/cpp/managementgen/qmfgen/management-types.xml
index efa8322806..efa8322806 100644
--- a/cpp/managementgen/qmfgen/management-types.xml
+++ b/qpid/cpp/managementgen/qmfgen/management-types.xml
diff --git a/cpp/managementgen/qmfgen/schema.py b/qpid/cpp/managementgen/qmfgen/schema.py
index 7bf161dc2b..7bf161dc2b 100755
--- a/cpp/managementgen/qmfgen/schema.py
+++ b/qpid/cpp/managementgen/qmfgen/schema.py
diff --git a/cpp/managementgen/qmfgen/templates/Args.h b/qpid/cpp/managementgen/qmfgen/templates/Args.h
index 89a5bec9b9..89a5bec9b9 100644
--- a/cpp/managementgen/qmfgen/templates/Args.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Args.h
diff --git a/cpp/managementgen/qmfgen/templates/CMakeLists.cmake b/qpid/cpp/managementgen/qmfgen/templates/CMakeLists.cmake
index d8a3b91b10..d8a3b91b10 100644
--- a/cpp/managementgen/qmfgen/templates/CMakeLists.cmake
+++ b/qpid/cpp/managementgen/qmfgen/templates/CMakeLists.cmake
diff --git a/cpp/managementgen/qmfgen/templates/Class.cpp b/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
index bb7bd66fc6..bb7bd66fc6 100644
--- a/cpp/managementgen/qmfgen/templates/Class.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/Class.cpp
diff --git a/cpp/managementgen/qmfgen/templates/Class.h b/qpid/cpp/managementgen/qmfgen/templates/Class.h
index 84fe3df5da..84fe3df5da 100644
--- a/cpp/managementgen/qmfgen/templates/Class.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Class.h
diff --git a/cpp/managementgen/qmfgen/templates/Event.cpp b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
index a6043ffa15..a6043ffa15 100644
--- a/cpp/managementgen/qmfgen/templates/Event.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/Event.cpp
diff --git a/cpp/managementgen/qmfgen/templates/Event.h b/qpid/cpp/managementgen/qmfgen/templates/Event.h
index e5f5f53c1f..e5f5f53c1f 100644
--- a/cpp/managementgen/qmfgen/templates/Event.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Event.h
diff --git a/cpp/managementgen/qmfgen/templates/Package.cpp b/qpid/cpp/managementgen/qmfgen/templates/Package.cpp
index f6bd7f4654..f6bd7f4654 100644
--- a/cpp/managementgen/qmfgen/templates/Package.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/Package.cpp
diff --git a/cpp/managementgen/qmfgen/templates/Package.h b/qpid/cpp/managementgen/qmfgen/templates/Package.h
index 3260b03cce..3260b03cce 100644
--- a/cpp/managementgen/qmfgen/templates/Package.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/Package.h
diff --git a/cpp/managementgen/qmfgen/templates/V2Package.cpp b/qpid/cpp/managementgen/qmfgen/templates/V2Package.cpp
index 2b6e231fe9..2b6e231fe9 100644
--- a/cpp/managementgen/qmfgen/templates/V2Package.cpp
+++ b/qpid/cpp/managementgen/qmfgen/templates/V2Package.cpp
diff --git a/cpp/managementgen/qmfgen/templates/V2Package.h b/qpid/cpp/managementgen/qmfgen/templates/V2Package.h
index 1d4f907ab3..1d4f907ab3 100644
--- a/cpp/managementgen/qmfgen/templates/V2Package.h
+++ b/qpid/cpp/managementgen/qmfgen/templates/V2Package.h
diff --git a/cpp/packaging/NSIS/qpid-icon.ico b/qpid/cpp/packaging/NSIS/qpid-icon.ico
index 112f5d8f1f..112f5d8f1f 100644
--- a/cpp/packaging/NSIS/qpid-icon.ico
+++ b/qpid/cpp/packaging/NSIS/qpid-icon.ico
diff --git a/cpp/packaging/NSIS/qpid-icon.png b/qpid/cpp/packaging/NSIS/qpid-icon.png
index d9bcc5657f..d9bcc5657f 100644
--- a/cpp/packaging/NSIS/qpid-icon.png
+++ b/qpid/cpp/packaging/NSIS/qpid-icon.png
diff --git a/cpp/packaging/NSIS/qpid-install-banner.bmp b/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp
index 1dac04c685..1dac04c685 100644
--- a/cpp/packaging/NSIS/qpid-install-banner.bmp
+++ b/qpid/cpp/packaging/NSIS/qpid-install-banner.bmp
diff --git a/cpp/packaging/NSIS/qpid-install-banner.png b/qpid/cpp/packaging/NSIS/qpid-install-banner.png
index be70d02ee6..be70d02ee6 100644
--- a/cpp/packaging/NSIS/qpid-install-banner.png
+++ b/qpid/cpp/packaging/NSIS/qpid-install-banner.png
diff --git a/cpp/rubygen/MethodBodyDefaultVisitor.rb b/qpid/cpp/rubygen/MethodBodyDefaultVisitor.rb
index 11dbcb8f83..11dbcb8f83 100755
--- a/cpp/rubygen/MethodBodyDefaultVisitor.rb
+++ b/qpid/cpp/rubygen/MethodBodyDefaultVisitor.rb
diff --git a/cpp/rubygen/README.txt b/qpid/cpp/rubygen/README.txt
index a1fd6cfec8..a1fd6cfec8 100644
--- a/cpp/rubygen/README.txt
+++ b/qpid/cpp/rubygen/README.txt
diff --git a/cpp/rubygen/amqpgen.rb b/qpid/cpp/rubygen/amqpgen.rb
index 7eee953c04..7eee953c04 100755
--- a/cpp/rubygen/amqpgen.rb
+++ b/qpid/cpp/rubygen/amqpgen.rb
diff --git a/cpp/rubygen/cppgen.rb b/qpid/cpp/rubygen/cppgen.rb
index 3d21e7d4fa..3d21e7d4fa 100755
--- a/cpp/rubygen/cppgen.rb
+++ b/qpid/cpp/rubygen/cppgen.rb
diff --git a/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb b/qpid/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb
index d784e589df..d784e589df 100755
--- a/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb
+++ b/qpid/cpp/rubygen/framing.0-10/MethodBodyConstVisitor.rb
diff --git a/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb b/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
index 4c58ff2bbb..4c58ff2bbb 100755
--- a/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
+++ b/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
diff --git a/cpp/rubygen/framing.0-10/MethodBodyFactory.rb b/qpid/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
index 28a5d94e32..28a5d94e32 100644
--- a/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
+++ b/qpid/cpp/rubygen/framing.0-10/MethodBodyFactory.rb
diff --git a/cpp/rubygen/framing.0-10/Operations.rb b/qpid/cpp/rubygen/framing.0-10/Operations.rb
index cd6a363c56..cd6a363c56 100755
--- a/cpp/rubygen/framing.0-10/Operations.rb
+++ b/qpid/cpp/rubygen/framing.0-10/Operations.rb
diff --git a/cpp/rubygen/framing.0-10/OperationsInvoker.rb b/qpid/cpp/rubygen/framing.0-10/OperationsInvoker.rb
index f9b5ce58d8..f9b5ce58d8 100755
--- a/cpp/rubygen/framing.0-10/OperationsInvoker.rb
+++ b/qpid/cpp/rubygen/framing.0-10/OperationsInvoker.rb
diff --git a/cpp/rubygen/framing.0-10/Proxy.rb b/qpid/cpp/rubygen/framing.0-10/Proxy.rb
index 3325616754..3325616754 100755
--- a/cpp/rubygen/framing.0-10/Proxy.rb
+++ b/qpid/cpp/rubygen/framing.0-10/Proxy.rb
diff --git a/cpp/rubygen/framing.0-10/Session.rb b/qpid/cpp/rubygen/framing.0-10/Session.rb
index 28165448ed..28165448ed 100755
--- a/cpp/rubygen/framing.0-10/Session.rb
+++ b/qpid/cpp/rubygen/framing.0-10/Session.rb
diff --git a/cpp/rubygen/framing.0-10/all_method_bodies.rb b/qpid/cpp/rubygen/framing.0-10/all_method_bodies.rb
index 4c7fccfff5..4c7fccfff5 100755
--- a/cpp/rubygen/framing.0-10/all_method_bodies.rb
+++ b/qpid/cpp/rubygen/framing.0-10/all_method_bodies.rb
diff --git a/cpp/rubygen/framing.0-10/constants.rb b/qpid/cpp/rubygen/framing.0-10/constants.rb
index 589d94e23d..589d94e23d 100755
--- a/cpp/rubygen/framing.0-10/constants.rb
+++ b/qpid/cpp/rubygen/framing.0-10/constants.rb
diff --git a/cpp/rubygen/framing.0-10/frame_body_lists.rb b/qpid/cpp/rubygen/framing.0-10/frame_body_lists.rb
index 4f1b976032..4f1b976032 100644
--- a/cpp/rubygen/framing.0-10/frame_body_lists.rb
+++ b/qpid/cpp/rubygen/framing.0-10/frame_body_lists.rb
diff --git a/cpp/rubygen/framing.0-10/structs.rb b/qpid/cpp/rubygen/framing.0-10/structs.rb
index f93742e57e..f93742e57e 100755
--- a/cpp/rubygen/framing.0-10/structs.rb
+++ b/qpid/cpp/rubygen/framing.0-10/structs.rb
diff --git a/cpp/rubygen/generate b/qpid/cpp/rubygen/generate
index 3ab22e4fda..3ab22e4fda 100755
--- a/cpp/rubygen/generate
+++ b/qpid/cpp/rubygen/generate
diff --git a/cpp/specs/amqp.0-10-qpid-errata.stripped.xml b/qpid/cpp/specs/amqp.0-10-qpid-errata.stripped.xml
index 83ddf709e9..83ddf709e9 100644
--- a/cpp/specs/amqp.0-10-qpid-errata.stripped.xml
+++ b/qpid/cpp/specs/amqp.0-10-qpid-errata.stripped.xml
diff --git a/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index 8e2b5b73e8..8e2b5b73e8 100644
--- a/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
diff --git a/cpp/src/CMakeWinVersions.cmake b/qpid/cpp/src/CMakeWinVersions.cmake
index 0bac7cab47..0bac7cab47 100644
--- a/cpp/src/CMakeWinVersions.cmake
+++ b/qpid/cpp/src/CMakeWinVersions.cmake
diff --git a/cpp/src/QpidConfig.cmake.in b/qpid/cpp/src/QpidConfig.cmake.in
index 3f84e3b6b0..3f84e3b6b0 100644
--- a/cpp/src/QpidConfig.cmake.in
+++ b/qpid/cpp/src/QpidConfig.cmake.in
diff --git a/cpp/src/QpidConfigVersion.cmake.in b/qpid/cpp/src/QpidConfigVersion.cmake.in
index d85924ab7e..d85924ab7e 100644
--- a/cpp/src/QpidConfigVersion.cmake.in
+++ b/qpid/cpp/src/QpidConfigVersion.cmake.in
diff --git a/cpp/src/amqp.cmake b/qpid/cpp/src/amqp.cmake
index 9e2bf75ac4..9e2bf75ac4 100644
--- a/cpp/src/amqp.cmake
+++ b/qpid/cpp/src/amqp.cmake
diff --git a/cpp/src/check-abi b/qpid/cpp/src/check-abi
index 3e85dab862..3e85dab862 100755
--- a/cpp/src/check-abi
+++ b/qpid/cpp/src/check-abi
diff --git a/cpp/src/config.h.cmake b/qpid/cpp/src/config.h.cmake
index 1e1f4087ee..1e1f4087ee 100644
--- a/cpp/src/config.h.cmake
+++ b/qpid/cpp/src/config.h.cmake
diff --git a/cpp/src/finddb.cmake b/qpid/cpp/src/finddb.cmake
index 2f2f94f469..2f2f94f469 100644
--- a/cpp/src/finddb.cmake
+++ b/qpid/cpp/src/finddb.cmake
diff --git a/cpp/src/legacystore.cmake b/qpid/cpp/src/legacystore.cmake
index 3cb1171b00..3cb1171b00 100644
--- a/cpp/src/legacystore.cmake
+++ b/qpid/cpp/src/legacystore.cmake
diff --git a/cpp/src/libqpidmessaging-api-symbols.txt b/qpid/cpp/src/libqpidmessaging-api-symbols.txt
index 23634857c2..23634857c2 100644
--- a/cpp/src/libqpidmessaging-api-symbols.txt
+++ b/qpid/cpp/src/libqpidmessaging-api-symbols.txt
diff --git a/cpp/src/libqpidtypes-api-symbols.txt b/qpid/cpp/src/libqpidtypes-api-symbols.txt
index 04e7a6775e..04e7a6775e 100644
--- a/cpp/src/libqpidtypes-api-symbols.txt
+++ b/qpid/cpp/src/libqpidtypes-api-symbols.txt
diff --git a/cpp/src/linearstore.cmake b/qpid/cpp/src/linearstore.cmake
index e876ca712a..e876ca712a 100644
--- a/cpp/src/linearstore.cmake
+++ b/qpid/cpp/src/linearstore.cmake
diff --git a/cpp/src/msvc.cmake b/qpid/cpp/src/msvc.cmake
index dc248f4f96..dc248f4f96 100644
--- a/cpp/src/msvc.cmake
+++ b/qpid/cpp/src/msvc.cmake
diff --git a/cpp/src/posix/QpiddBroker.cpp b/qpid/cpp/src/posix/QpiddBroker.cpp
index 7caffd570e..7caffd570e 100644
--- a/cpp/src/posix/QpiddBroker.cpp
+++ b/qpid/cpp/src/posix/QpiddBroker.cpp
diff --git a/cpp/src/prof b/qpid/cpp/src/prof
index fa470f5f84..fa470f5f84 100755
--- a/cpp/src/prof
+++ b/qpid/cpp/src/prof
diff --git a/cpp/src/qmf/Agent.cpp b/qpid/cpp/src/qmf/Agent.cpp
index fa3987e0c9..fa3987e0c9 100644
--- a/cpp/src/qmf/Agent.cpp
+++ b/qpid/cpp/src/qmf/Agent.cpp
diff --git a/cpp/src/qmf/AgentEvent.cpp b/qpid/cpp/src/qmf/AgentEvent.cpp
index 2dc24ecac1..2dc24ecac1 100644
--- a/cpp/src/qmf/AgentEvent.cpp
+++ b/qpid/cpp/src/qmf/AgentEvent.cpp
diff --git a/cpp/src/qmf/AgentEventImpl.h b/qpid/cpp/src/qmf/AgentEventImpl.h
index 1ecb41775a..1ecb41775a 100644
--- a/cpp/src/qmf/AgentEventImpl.h
+++ b/qpid/cpp/src/qmf/AgentEventImpl.h
diff --git a/cpp/src/qmf/AgentImpl.h b/qpid/cpp/src/qmf/AgentImpl.h
index 09754a3a7e..09754a3a7e 100644
--- a/cpp/src/qmf/AgentImpl.h
+++ b/qpid/cpp/src/qmf/AgentImpl.h
diff --git a/cpp/src/qmf/AgentSession.cpp b/qpid/cpp/src/qmf/AgentSession.cpp
index 4605285448..4605285448 100644
--- a/cpp/src/qmf/AgentSession.cpp
+++ b/qpid/cpp/src/qmf/AgentSession.cpp
diff --git a/cpp/src/qmf/AgentSessionImpl.h b/qpid/cpp/src/qmf/AgentSessionImpl.h
index 64a39ab2e8..64a39ab2e8 100644
--- a/cpp/src/qmf/AgentSessionImpl.h
+++ b/qpid/cpp/src/qmf/AgentSessionImpl.h
diff --git a/cpp/src/qmf/AgentSubscription.cpp b/qpid/cpp/src/qmf/AgentSubscription.cpp
index 4dc5cb74a4..4dc5cb74a4 100644
--- a/cpp/src/qmf/AgentSubscription.cpp
+++ b/qpid/cpp/src/qmf/AgentSubscription.cpp
diff --git a/cpp/src/qmf/AgentSubscription.h b/qpid/cpp/src/qmf/AgentSubscription.h
index 01e8f43e9f..01e8f43e9f 100644
--- a/cpp/src/qmf/AgentSubscription.h
+++ b/qpid/cpp/src/qmf/AgentSubscription.h
diff --git a/cpp/src/qmf/ConsoleEvent.cpp b/qpid/cpp/src/qmf/ConsoleEvent.cpp
index b2a5e321c7..b2a5e321c7 100644
--- a/cpp/src/qmf/ConsoleEvent.cpp
+++ b/qpid/cpp/src/qmf/ConsoleEvent.cpp
diff --git a/cpp/src/qmf/ConsoleEventImpl.h b/qpid/cpp/src/qmf/ConsoleEventImpl.h
index 9843971456..9843971456 100644
--- a/cpp/src/qmf/ConsoleEventImpl.h
+++ b/qpid/cpp/src/qmf/ConsoleEventImpl.h
diff --git a/cpp/src/qmf/ConsoleSession.cpp b/qpid/cpp/src/qmf/ConsoleSession.cpp
index c74d4de8db..c74d4de8db 100644
--- a/cpp/src/qmf/ConsoleSession.cpp
+++ b/qpid/cpp/src/qmf/ConsoleSession.cpp
diff --git a/cpp/src/qmf/ConsoleSessionImpl.h b/qpid/cpp/src/qmf/ConsoleSessionImpl.h
index 2c06df030c..2c06df030c 100644
--- a/cpp/src/qmf/ConsoleSessionImpl.h
+++ b/qpid/cpp/src/qmf/ConsoleSessionImpl.h
diff --git a/cpp/src/qmf/Data.cpp b/qpid/cpp/src/qmf/Data.cpp
index c503bab445..c503bab445 100644
--- a/cpp/src/qmf/Data.cpp
+++ b/qpid/cpp/src/qmf/Data.cpp
diff --git a/cpp/src/qmf/DataAddr.cpp b/qpid/cpp/src/qmf/DataAddr.cpp
index 08b64d5b5d..08b64d5b5d 100644
--- a/cpp/src/qmf/DataAddr.cpp
+++ b/qpid/cpp/src/qmf/DataAddr.cpp
diff --git a/cpp/src/qmf/DataAddrImpl.h b/qpid/cpp/src/qmf/DataAddrImpl.h
index 11d512f0c4..11d512f0c4 100644
--- a/cpp/src/qmf/DataAddrImpl.h
+++ b/qpid/cpp/src/qmf/DataAddrImpl.h
diff --git a/cpp/src/qmf/DataImpl.h b/qpid/cpp/src/qmf/DataImpl.h
index 4ac3197da0..4ac3197da0 100644
--- a/cpp/src/qmf/DataImpl.h
+++ b/qpid/cpp/src/qmf/DataImpl.h
diff --git a/cpp/src/qmf/EventNotifierImpl.cpp b/qpid/cpp/src/qmf/EventNotifierImpl.cpp
index 81b6d637a3..81b6d637a3 100644
--- a/cpp/src/qmf/EventNotifierImpl.cpp
+++ b/qpid/cpp/src/qmf/EventNotifierImpl.cpp
diff --git a/cpp/src/qmf/EventNotifierImpl.h b/qpid/cpp/src/qmf/EventNotifierImpl.h
index d85f9979d2..d85f9979d2 100644
--- a/cpp/src/qmf/EventNotifierImpl.h
+++ b/qpid/cpp/src/qmf/EventNotifierImpl.h
diff --git a/cpp/src/qmf/Expression.cpp b/qpid/cpp/src/qmf/Expression.cpp
index 7d48678c15..7d48678c15 100644
--- a/cpp/src/qmf/Expression.cpp
+++ b/qpid/cpp/src/qmf/Expression.cpp
diff --git a/cpp/src/qmf/Expression.h b/qpid/cpp/src/qmf/Expression.h
index 6fbfdbc4ba..6fbfdbc4ba 100644
--- a/cpp/src/qmf/Expression.h
+++ b/qpid/cpp/src/qmf/Expression.h
diff --git a/cpp/src/qmf/Hash.cpp b/qpid/cpp/src/qmf/Hash.cpp
index 86738dda2f..86738dda2f 100644
--- a/cpp/src/qmf/Hash.cpp
+++ b/qpid/cpp/src/qmf/Hash.cpp
diff --git a/cpp/src/qmf/Hash.h b/qpid/cpp/src/qmf/Hash.h
index 4bd76832aa..4bd76832aa 100644
--- a/cpp/src/qmf/Hash.h
+++ b/qpid/cpp/src/qmf/Hash.h
diff --git a/cpp/src/qmf/PosixEventNotifier.cpp b/qpid/cpp/src/qmf/PosixEventNotifier.cpp
index a364cc155d..a364cc155d 100644
--- a/cpp/src/qmf/PosixEventNotifier.cpp
+++ b/qpid/cpp/src/qmf/PosixEventNotifier.cpp
diff --git a/cpp/src/qmf/PosixEventNotifierImpl.cpp b/qpid/cpp/src/qmf/PosixEventNotifierImpl.cpp
index 011dbcc214..011dbcc214 100644
--- a/cpp/src/qmf/PosixEventNotifierImpl.cpp
+++ b/qpid/cpp/src/qmf/PosixEventNotifierImpl.cpp
diff --git a/cpp/src/qmf/PosixEventNotifierImpl.h b/qpid/cpp/src/qmf/PosixEventNotifierImpl.h
index c8a7446bd5..c8a7446bd5 100644
--- a/cpp/src/qmf/PosixEventNotifierImpl.h
+++ b/qpid/cpp/src/qmf/PosixEventNotifierImpl.h
diff --git a/cpp/src/qmf/PrivateImplRef.h b/qpid/cpp/src/qmf/PrivateImplRef.h
index c0c07d7e1b..c0c07d7e1b 100644
--- a/cpp/src/qmf/PrivateImplRef.h
+++ b/qpid/cpp/src/qmf/PrivateImplRef.h
diff --git a/cpp/src/qmf/Query.cpp b/qpid/cpp/src/qmf/Query.cpp
index ee8ca38e59..ee8ca38e59 100644
--- a/cpp/src/qmf/Query.cpp
+++ b/qpid/cpp/src/qmf/Query.cpp
diff --git a/cpp/src/qmf/QueryImpl.h b/qpid/cpp/src/qmf/QueryImpl.h
index 27ec427684..27ec427684 100644
--- a/cpp/src/qmf/QueryImpl.h
+++ b/qpid/cpp/src/qmf/QueryImpl.h
diff --git a/cpp/src/qmf/Schema.cpp b/qpid/cpp/src/qmf/Schema.cpp
index 872aad724c..872aad724c 100644
--- a/cpp/src/qmf/Schema.cpp
+++ b/qpid/cpp/src/qmf/Schema.cpp
diff --git a/cpp/src/qmf/SchemaCache.cpp b/qpid/cpp/src/qmf/SchemaCache.cpp
index 74ca4044fd..74ca4044fd 100644
--- a/cpp/src/qmf/SchemaCache.cpp
+++ b/qpid/cpp/src/qmf/SchemaCache.cpp
diff --git a/cpp/src/qmf/SchemaCache.h b/qpid/cpp/src/qmf/SchemaCache.h
index a1f104233f..a1f104233f 100644
--- a/cpp/src/qmf/SchemaCache.h
+++ b/qpid/cpp/src/qmf/SchemaCache.h
diff --git a/cpp/src/qmf/SchemaId.cpp b/qpid/cpp/src/qmf/SchemaId.cpp
index 25fa9915ae..25fa9915ae 100644
--- a/cpp/src/qmf/SchemaId.cpp
+++ b/qpid/cpp/src/qmf/SchemaId.cpp
diff --git a/cpp/src/qmf/SchemaIdImpl.h b/qpid/cpp/src/qmf/SchemaIdImpl.h
index ae1a3d8d3b..ae1a3d8d3b 100644
--- a/cpp/src/qmf/SchemaIdImpl.h
+++ b/qpid/cpp/src/qmf/SchemaIdImpl.h
diff --git a/cpp/src/qmf/SchemaImpl.h b/qpid/cpp/src/qmf/SchemaImpl.h
index 1c88f87808..1c88f87808 100644
--- a/cpp/src/qmf/SchemaImpl.h
+++ b/qpid/cpp/src/qmf/SchemaImpl.h
diff --git a/cpp/src/qmf/SchemaMethod.cpp b/qpid/cpp/src/qmf/SchemaMethod.cpp
index e267878238..e267878238 100644
--- a/cpp/src/qmf/SchemaMethod.cpp
+++ b/qpid/cpp/src/qmf/SchemaMethod.cpp
diff --git a/cpp/src/qmf/SchemaMethodImpl.h b/qpid/cpp/src/qmf/SchemaMethodImpl.h
index 930d48509c..930d48509c 100644
--- a/cpp/src/qmf/SchemaMethodImpl.h
+++ b/qpid/cpp/src/qmf/SchemaMethodImpl.h
diff --git a/cpp/src/qmf/SchemaProperty.cpp b/qpid/cpp/src/qmf/SchemaProperty.cpp
index 106127261b..106127261b 100644
--- a/cpp/src/qmf/SchemaProperty.cpp
+++ b/qpid/cpp/src/qmf/SchemaProperty.cpp
diff --git a/cpp/src/qmf/SchemaPropertyImpl.h b/qpid/cpp/src/qmf/SchemaPropertyImpl.h
index cdfc29066f..cdfc29066f 100644
--- a/cpp/src/qmf/SchemaPropertyImpl.h
+++ b/qpid/cpp/src/qmf/SchemaPropertyImpl.h
diff --git a/cpp/src/qmf/Subscription.cpp b/qpid/cpp/src/qmf/Subscription.cpp
index 73afc8c79d..73afc8c79d 100644
--- a/cpp/src/qmf/Subscription.cpp
+++ b/qpid/cpp/src/qmf/Subscription.cpp
diff --git a/cpp/src/qmf/SubscriptionImpl.h b/qpid/cpp/src/qmf/SubscriptionImpl.h
index 053e3cd00e..053e3cd00e 100644
--- a/cpp/src/qmf/SubscriptionImpl.h
+++ b/qpid/cpp/src/qmf/SubscriptionImpl.h
diff --git a/cpp/src/qmf/agentCapability.h b/qpid/cpp/src/qmf/agentCapability.h
index 6a3f6f8534..6a3f6f8534 100644
--- a/cpp/src/qmf/agentCapability.h
+++ b/qpid/cpp/src/qmf/agentCapability.h
diff --git a/cpp/src/qmf/constants.cpp b/qpid/cpp/src/qmf/constants.cpp
index 6e2fd935a9..6e2fd935a9 100644
--- a/cpp/src/qmf/constants.cpp
+++ b/qpid/cpp/src/qmf/constants.cpp
diff --git a/cpp/src/qmf/constants.h b/qpid/cpp/src/qmf/constants.h
index 79beaaf1ca..79beaaf1ca 100644
--- a/cpp/src/qmf/constants.h
+++ b/qpid/cpp/src/qmf/constants.h
diff --git a/cpp/src/qmf/exceptions.cpp b/qpid/cpp/src/qmf/exceptions.cpp
index be212f62f7..be212f62f7 100644
--- a/cpp/src/qmf/exceptions.cpp
+++ b/qpid/cpp/src/qmf/exceptions.cpp
diff --git a/cpp/src/qmf2.pc.in b/qpid/cpp/src/qmf2.pc.in
index 4c7e6f9763..4c7e6f9763 100644
--- a/cpp/src/qmf2.pc.in
+++ b/qpid/cpp/src/qmf2.pc.in
diff --git a/cpp/src/qpid.linkmap b/qpid/cpp/src/qpid.linkmap
index 264e6bac57..264e6bac57 100644
--- a/cpp/src/qpid.linkmap
+++ b/qpid/cpp/src/qpid.linkmap
diff --git a/cpp/src/qpid.pc.in b/qpid/cpp/src/qpid.pc.in
index c44a157347..c44a157347 100644
--- a/cpp/src/qpid.pc.in
+++ b/qpid/cpp/src/qpid.pc.in
diff --git a/cpp/src/qpid/AclHost.cpp b/qpid/cpp/src/qpid/AclHost.cpp
index 1581d3b46a..1581d3b46a 100644
--- a/cpp/src/qpid/AclHost.cpp
+++ b/qpid/cpp/src/qpid/AclHost.cpp
diff --git a/cpp/src/qpid/AclHost.h b/qpid/cpp/src/qpid/AclHost.h
index 3c4bbe1ce3..3c4bbe1ce3 100644
--- a/cpp/src/qpid/AclHost.h
+++ b/qpid/cpp/src/qpid/AclHost.h
diff --git a/cpp/src/qpid/Address.cpp b/qpid/cpp/src/qpid/Address.cpp
index 01770524c8..01770524c8 100644
--- a/cpp/src/qpid/Address.cpp
+++ b/qpid/cpp/src/qpid/Address.cpp
diff --git a/cpp/src/qpid/Address.h b/qpid/cpp/src/qpid/Address.h
index fe43f3847d..fe43f3847d 100755
--- a/cpp/src/qpid/Address.h
+++ b/qpid/cpp/src/qpid/Address.h
diff --git a/cpp/src/qpid/BufferRef.h b/qpid/cpp/src/qpid/BufferRef.h
index bfe1f9ebaa..bfe1f9ebaa 100644
--- a/cpp/src/qpid/BufferRef.h
+++ b/qpid/cpp/src/qpid/BufferRef.h
diff --git a/cpp/src/qpid/CommonImportExport.h b/qpid/cpp/src/qpid/CommonImportExport.h
index dd2b900b73..dd2b900b73 100644
--- a/cpp/src/qpid/CommonImportExport.h
+++ b/qpid/cpp/src/qpid/CommonImportExport.h
diff --git a/cpp/src/qpid/DataDir.cpp b/qpid/cpp/src/qpid/DataDir.cpp
index 546df3dabd..546df3dabd 100644
--- a/cpp/src/qpid/DataDir.cpp
+++ b/qpid/cpp/src/qpid/DataDir.cpp
diff --git a/cpp/src/qpid/DataDir.h b/qpid/cpp/src/qpid/DataDir.h
index ec73d28796..ec73d28796 100644
--- a/cpp/src/qpid/DataDir.h
+++ b/qpid/cpp/src/qpid/DataDir.h
diff --git a/cpp/src/qpid/DisableExceptionLogging.h b/qpid/cpp/src/qpid/DisableExceptionLogging.h
index 04a9240513..04a9240513 100644
--- a/cpp/src/qpid/DisableExceptionLogging.h
+++ b/qpid/cpp/src/qpid/DisableExceptionLogging.h
diff --git a/cpp/src/qpid/Exception.cpp b/qpid/cpp/src/qpid/Exception.cpp
index 999c2aeb52..999c2aeb52 100644
--- a/cpp/src/qpid/Exception.cpp
+++ b/qpid/cpp/src/qpid/Exception.cpp
diff --git a/cpp/src/qpid/Exception.h b/qpid/cpp/src/qpid/Exception.h
index 6df012ba28..6df012ba28 100644
--- a/cpp/src/qpid/Exception.h
+++ b/qpid/cpp/src/qpid/Exception.h
diff --git a/cpp/src/qpid/InlineAllocator.h b/qpid/cpp/src/qpid/InlineAllocator.h
index 28ea73ec12..28ea73ec12 100644
--- a/cpp/src/qpid/InlineAllocator.h
+++ b/qpid/cpp/src/qpid/InlineAllocator.h
diff --git a/cpp/src/qpid/InlineVector.h b/qpid/cpp/src/qpid/InlineVector.h
index c55db295f3..c55db295f3 100644
--- a/cpp/src/qpid/InlineVector.h
+++ b/qpid/cpp/src/qpid/InlineVector.h
diff --git a/cpp/src/qpid/Modules.cpp b/qpid/cpp/src/qpid/Modules.cpp
index 049ededaa7..049ededaa7 100644
--- a/cpp/src/qpid/Modules.cpp
+++ b/qpid/cpp/src/qpid/Modules.cpp
diff --git a/cpp/src/qpid/Modules.h b/qpid/cpp/src/qpid/Modules.h
index 9fb91d60eb..9fb91d60eb 100644
--- a/cpp/src/qpid/Modules.h
+++ b/qpid/cpp/src/qpid/Modules.h
diff --git a/cpp/src/qpid/Msg.h b/qpid/cpp/src/qpid/Msg.h
index 5f0b11bc60..5f0b11bc60 100644
--- a/cpp/src/qpid/Msg.h
+++ b/qpid/cpp/src/qpid/Msg.h
diff --git a/cpp/src/qpid/NullSaslClient.cpp b/qpid/cpp/src/qpid/NullSaslClient.cpp
index 30c2330553..30c2330553 100644
--- a/cpp/src/qpid/NullSaslClient.cpp
+++ b/qpid/cpp/src/qpid/NullSaslClient.cpp
diff --git a/cpp/src/qpid/NullSaslClient.h b/qpid/cpp/src/qpid/NullSaslClient.h
index 26882c6c20..26882c6c20 100644
--- a/cpp/src/qpid/NullSaslClient.h
+++ b/qpid/cpp/src/qpid/NullSaslClient.h
diff --git a/cpp/src/qpid/NullSaslServer.cpp b/qpid/cpp/src/qpid/NullSaslServer.cpp
index 9d560c8e68..9d560c8e68 100644
--- a/cpp/src/qpid/NullSaslServer.cpp
+++ b/qpid/cpp/src/qpid/NullSaslServer.cpp
diff --git a/cpp/src/qpid/NullSaslServer.h b/qpid/cpp/src/qpid/NullSaslServer.h
index 22a1b293a3..22a1b293a3 100644
--- a/cpp/src/qpid/NullSaslServer.h
+++ b/qpid/cpp/src/qpid/NullSaslServer.h
diff --git a/cpp/src/qpid/Options.cpp b/qpid/cpp/src/qpid/Options.cpp
index 0021afc574..0021afc574 100644
--- a/cpp/src/qpid/Options.cpp
+++ b/qpid/cpp/src/qpid/Options.cpp
diff --git a/cpp/src/qpid/Options.h b/qpid/cpp/src/qpid/Options.h
index ed4221fc90..ed4221fc90 100644
--- a/cpp/src/qpid/Options.h
+++ b/qpid/cpp/src/qpid/Options.h
diff --git a/cpp/src/qpid/OptionsTemplates.h b/qpid/cpp/src/qpid/OptionsTemplates.h
index 5e7f7b5e1d..5e7f7b5e1d 100644
--- a/cpp/src/qpid/OptionsTemplates.h
+++ b/qpid/cpp/src/qpid/OptionsTemplates.h
diff --git a/cpp/src/qpid/Plugin.cpp b/qpid/cpp/src/qpid/Plugin.cpp
index 196b5c2333..196b5c2333 100644
--- a/cpp/src/qpid/Plugin.cpp
+++ b/qpid/cpp/src/qpid/Plugin.cpp
diff --git a/cpp/src/qpid/Plugin.h b/qpid/cpp/src/qpid/Plugin.h
index 4e057872b9..4e057872b9 100644
--- a/cpp/src/qpid/Plugin.h
+++ b/qpid/cpp/src/qpid/Plugin.h
diff --git a/cpp/src/qpid/RangeSet.h b/qpid/cpp/src/qpid/RangeSet.h
index 20ee722fcb..20ee722fcb 100644
--- a/cpp/src/qpid/RangeSet.h
+++ b/qpid/cpp/src/qpid/RangeSet.h
diff --git a/cpp/src/qpid/RefCounted.h b/qpid/cpp/src/qpid/RefCounted.h
index c2ec367658..c2ec367658 100644
--- a/cpp/src/qpid/RefCounted.h
+++ b/qpid/cpp/src/qpid/RefCounted.h
diff --git a/cpp/src/qpid/RefCountedBuffer.cpp b/qpid/cpp/src/qpid/RefCountedBuffer.cpp
index a82e1a02ab..a82e1a02ab 100644
--- a/cpp/src/qpid/RefCountedBuffer.cpp
+++ b/qpid/cpp/src/qpid/RefCountedBuffer.cpp
diff --git a/cpp/src/qpid/RefCountedBuffer.h b/qpid/cpp/src/qpid/RefCountedBuffer.h
index f0ea86130b..f0ea86130b 100644
--- a/cpp/src/qpid/RefCountedBuffer.h
+++ b/qpid/cpp/src/qpid/RefCountedBuffer.h
diff --git a/cpp/src/qpid/Sasl.h b/qpid/cpp/src/qpid/Sasl.h
index 1164fb5ec3..1164fb5ec3 100644
--- a/cpp/src/qpid/Sasl.h
+++ b/qpid/cpp/src/qpid/Sasl.h
diff --git a/cpp/src/qpid/SaslFactory.cpp b/qpid/cpp/src/qpid/SaslFactory.cpp
index 7bfc510936..7bfc510936 100644
--- a/cpp/src/qpid/SaslFactory.cpp
+++ b/qpid/cpp/src/qpid/SaslFactory.cpp
diff --git a/cpp/src/qpid/SaslFactory.h b/qpid/cpp/src/qpid/SaslFactory.h
index 39a9d74fd0..39a9d74fd0 100644
--- a/cpp/src/qpid/SaslFactory.h
+++ b/qpid/cpp/src/qpid/SaslFactory.h
diff --git a/cpp/src/qpid/SaslServer.h b/qpid/cpp/src/qpid/SaslServer.h
index 88909c69a9..88909c69a9 100644
--- a/cpp/src/qpid/SaslServer.h
+++ b/qpid/cpp/src/qpid/SaslServer.h
diff --git a/cpp/src/qpid/Serializer.h b/qpid/cpp/src/qpid/Serializer.h
index a8ded9f5e0..a8ded9f5e0 100644
--- a/cpp/src/qpid/Serializer.h
+++ b/qpid/cpp/src/qpid/Serializer.h
diff --git a/cpp/src/qpid/SessionId.cpp b/qpid/cpp/src/qpid/SessionId.cpp
index c7e83f83d7..c7e83f83d7 100644
--- a/cpp/src/qpid/SessionId.cpp
+++ b/qpid/cpp/src/qpid/SessionId.cpp
diff --git a/cpp/src/qpid/SessionId.h b/qpid/cpp/src/qpid/SessionId.h
index d950ad9d1a..d950ad9d1a 100644
--- a/cpp/src/qpid/SessionId.h
+++ b/qpid/cpp/src/qpid/SessionId.h
diff --git a/cpp/src/qpid/SessionState.cpp b/qpid/cpp/src/qpid/SessionState.cpp
index e5019604d2..e5019604d2 100644
--- a/cpp/src/qpid/SessionState.cpp
+++ b/qpid/cpp/src/qpid/SessionState.cpp
diff --git a/cpp/src/qpid/SessionState.h b/qpid/cpp/src/qpid/SessionState.h
index 02853b1143..02853b1143 100644
--- a/cpp/src/qpid/SessionState.h
+++ b/qpid/cpp/src/qpid/SessionState.h
diff --git a/cpp/src/qpid/SharedObject.h b/qpid/cpp/src/qpid/SharedObject.h
index 852a036ab9..852a036ab9 100644
--- a/cpp/src/qpid/SharedObject.h
+++ b/qpid/cpp/src/qpid/SharedObject.h
diff --git a/cpp/src/qpid/StringUtils.cpp b/qpid/cpp/src/qpid/StringUtils.cpp
index c436441c56..c436441c56 100644
--- a/cpp/src/qpid/StringUtils.cpp
+++ b/qpid/cpp/src/qpid/StringUtils.cpp
diff --git a/cpp/src/qpid/StringUtils.h b/qpid/cpp/src/qpid/StringUtils.h
index 4130fae017..4130fae017 100644
--- a/cpp/src/qpid/StringUtils.h
+++ b/qpid/cpp/src/qpid/StringUtils.h
diff --git a/cpp/src/qpid/Url.cpp b/qpid/cpp/src/qpid/Url.cpp
index 1780a07f92..1780a07f92 100644
--- a/cpp/src/qpid/Url.cpp
+++ b/qpid/cpp/src/qpid/Url.cpp
diff --git a/cpp/src/qpid/Url.h b/qpid/cpp/src/qpid/Url.h
index f9ed87c24b..f9ed87c24b 100644
--- a/cpp/src/qpid/Url.h
+++ b/qpid/cpp/src/qpid/Url.h
diff --git a/cpp/src/qpid/UrlArray.cpp b/qpid/cpp/src/qpid/UrlArray.cpp
index 9ebacbd945..9ebacbd945 100644
--- a/cpp/src/qpid/UrlArray.cpp
+++ b/qpid/cpp/src/qpid/UrlArray.cpp
diff --git a/cpp/src/qpid/UrlArray.h b/qpid/cpp/src/qpid/UrlArray.h
index f0065f0f0c..f0065f0f0c 100644
--- a/cpp/src/qpid/UrlArray.h
+++ b/qpid/cpp/src/qpid/UrlArray.h
diff --git a/cpp/src/qpid/Version.h b/qpid/cpp/src/qpid/Version.h
index 6a06566907..6a06566907 100755
--- a/cpp/src/qpid/Version.h
+++ b/qpid/cpp/src/qpid/Version.h
diff --git a/cpp/src/qpid/acl/Acl.cpp b/qpid/cpp/src/qpid/acl/Acl.cpp
index bd9482ef41..bd9482ef41 100644
--- a/cpp/src/qpid/acl/Acl.cpp
+++ b/qpid/cpp/src/qpid/acl/Acl.cpp
diff --git a/cpp/src/qpid/acl/Acl.h b/qpid/cpp/src/qpid/acl/Acl.h
index df2fb66c82..df2fb66c82 100644
--- a/cpp/src/qpid/acl/Acl.h
+++ b/qpid/cpp/src/qpid/acl/Acl.h
diff --git a/cpp/src/qpid/acl/AclConnectionCounter.cpp b/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
index ca3da50088..ca3da50088 100644
--- a/cpp/src/qpid/acl/AclConnectionCounter.cpp
+++ b/qpid/cpp/src/qpid/acl/AclConnectionCounter.cpp
diff --git a/cpp/src/qpid/acl/AclConnectionCounter.h b/qpid/cpp/src/qpid/acl/AclConnectionCounter.h
index 3683b573ff..3683b573ff 100644
--- a/cpp/src/qpid/acl/AclConnectionCounter.h
+++ b/qpid/cpp/src/qpid/acl/AclConnectionCounter.h
diff --git a/cpp/src/qpid/acl/AclData.cpp b/qpid/cpp/src/qpid/acl/AclData.cpp
index a629e44d60..a629e44d60 100644
--- a/cpp/src/qpid/acl/AclData.cpp
+++ b/qpid/cpp/src/qpid/acl/AclData.cpp
diff --git a/cpp/src/qpid/acl/AclData.h b/qpid/cpp/src/qpid/acl/AclData.h
index 105a5d9c67..105a5d9c67 100644
--- a/cpp/src/qpid/acl/AclData.h
+++ b/qpid/cpp/src/qpid/acl/AclData.h
diff --git a/cpp/src/qpid/acl/AclLexer.cpp b/qpid/cpp/src/qpid/acl/AclLexer.cpp
index 4006e5271f..4006e5271f 100644
--- a/cpp/src/qpid/acl/AclLexer.cpp
+++ b/qpid/cpp/src/qpid/acl/AclLexer.cpp
diff --git a/cpp/src/qpid/acl/AclLexer.h b/qpid/cpp/src/qpid/acl/AclLexer.h
index d3df411afd..d3df411afd 100644
--- a/cpp/src/qpid/acl/AclLexer.h
+++ b/qpid/cpp/src/qpid/acl/AclLexer.h
diff --git a/cpp/src/qpid/acl/AclPlugin.cpp b/qpid/cpp/src/qpid/acl/AclPlugin.cpp
index 77580ba531..77580ba531 100644
--- a/cpp/src/qpid/acl/AclPlugin.cpp
+++ b/qpid/cpp/src/qpid/acl/AclPlugin.cpp
diff --git a/cpp/src/qpid/acl/AclReader.cpp b/qpid/cpp/src/qpid/acl/AclReader.cpp
index e8223c3570..e8223c3570 100644
--- a/cpp/src/qpid/acl/AclReader.cpp
+++ b/qpid/cpp/src/qpid/acl/AclReader.cpp
diff --git a/cpp/src/qpid/acl/AclReader.h b/qpid/cpp/src/qpid/acl/AclReader.h
index 24237a82ce..24237a82ce 100644
--- a/cpp/src/qpid/acl/AclReader.h
+++ b/qpid/cpp/src/qpid/acl/AclReader.h
diff --git a/cpp/src/qpid/acl/AclResourceCounter.cpp b/qpid/cpp/src/qpid/acl/AclResourceCounter.cpp
index 2527af6375..2527af6375 100644
--- a/cpp/src/qpid/acl/AclResourceCounter.cpp
+++ b/qpid/cpp/src/qpid/acl/AclResourceCounter.cpp
diff --git a/cpp/src/qpid/acl/AclResourceCounter.h b/qpid/cpp/src/qpid/acl/AclResourceCounter.h
index 8809f73b18..8809f73b18 100644
--- a/cpp/src/qpid/acl/AclResourceCounter.h
+++ b/qpid/cpp/src/qpid/acl/AclResourceCounter.h
diff --git a/cpp/src/qpid/acl/AclTopicMatch.h b/qpid/cpp/src/qpid/acl/AclTopicMatch.h
index 654d1d63d4..654d1d63d4 100644
--- a/cpp/src/qpid/acl/AclTopicMatch.h
+++ b/qpid/cpp/src/qpid/acl/AclTopicMatch.h
diff --git a/cpp/src/qpid/acl/AclValidator.cpp b/qpid/cpp/src/qpid/acl/AclValidator.cpp
index f905b4aca5..f905b4aca5 100644
--- a/cpp/src/qpid/acl/AclValidator.cpp
+++ b/qpid/cpp/src/qpid/acl/AclValidator.cpp
diff --git a/cpp/src/qpid/acl/AclValidator.h b/qpid/cpp/src/qpid/acl/AclValidator.h
index 8f555797c2..8f555797c2 100644
--- a/cpp/src/qpid/acl/AclValidator.h
+++ b/qpid/cpp/src/qpid/acl/AclValidator.h
diff --git a/cpp/src/qpid/acl/management-schema.xml b/qpid/cpp/src/qpid/acl/management-schema.xml
index 2ac20bb324..2ac20bb324 100644
--- a/cpp/src/qpid/acl/management-schema.xml
+++ b/qpid/cpp/src/qpid/acl/management-schema.xml
diff --git a/cpp/src/qpid/amqp/CharSequence.cpp b/qpid/cpp/src/qpid/amqp/CharSequence.cpp
index ad5b0ec84c..ad5b0ec84c 100644
--- a/cpp/src/qpid/amqp/CharSequence.cpp
+++ b/qpid/cpp/src/qpid/amqp/CharSequence.cpp
diff --git a/cpp/src/qpid/amqp/CharSequence.h b/qpid/cpp/src/qpid/amqp/CharSequence.h
index 752097c913..752097c913 100644
--- a/cpp/src/qpid/amqp/CharSequence.h
+++ b/qpid/cpp/src/qpid/amqp/CharSequence.h
diff --git a/cpp/src/qpid/amqp/Codec.h b/qpid/cpp/src/qpid/amqp/Codec.h
index c91cd0a96b..c91cd0a96b 100644
--- a/cpp/src/qpid/amqp/Codec.h
+++ b/qpid/cpp/src/qpid/amqp/Codec.h
diff --git a/cpp/src/qpid/amqp/Constructor.h b/qpid/cpp/src/qpid/amqp/Constructor.h
index 444e455670..444e455670 100644
--- a/cpp/src/qpid/amqp/Constructor.h
+++ b/qpid/cpp/src/qpid/amqp/Constructor.h
diff --git a/cpp/src/qpid/amqp/DataBuilder.cpp b/qpid/cpp/src/qpid/amqp/DataBuilder.cpp
index aeb9b9c612..aeb9b9c612 100644
--- a/cpp/src/qpid/amqp/DataBuilder.cpp
+++ b/qpid/cpp/src/qpid/amqp/DataBuilder.cpp
diff --git a/cpp/src/qpid/amqp/DataBuilder.h b/qpid/cpp/src/qpid/amqp/DataBuilder.h
index 51ee3da5f8..51ee3da5f8 100644
--- a/cpp/src/qpid/amqp/DataBuilder.h
+++ b/qpid/cpp/src/qpid/amqp/DataBuilder.h
diff --git a/cpp/src/qpid/amqp/Decoder.cpp b/qpid/cpp/src/qpid/amqp/Decoder.cpp
index 53cd367c25..53cd367c25 100644
--- a/cpp/src/qpid/amqp/Decoder.cpp
+++ b/qpid/cpp/src/qpid/amqp/Decoder.cpp
diff --git a/cpp/src/qpid/amqp/Decoder.h b/qpid/cpp/src/qpid/amqp/Decoder.h
index a78518be2b..a78518be2b 100644
--- a/cpp/src/qpid/amqp/Decoder.h
+++ b/qpid/cpp/src/qpid/amqp/Decoder.h
diff --git a/cpp/src/qpid/amqp/Descriptor.cpp b/qpid/cpp/src/qpid/amqp/Descriptor.cpp
index 43d388ee76..43d388ee76 100644
--- a/cpp/src/qpid/amqp/Descriptor.cpp
+++ b/qpid/cpp/src/qpid/amqp/Descriptor.cpp
diff --git a/cpp/src/qpid/amqp/Descriptor.h b/qpid/cpp/src/qpid/amqp/Descriptor.h
index 3726114769..3726114769 100644
--- a/cpp/src/qpid/amqp/Descriptor.h
+++ b/qpid/cpp/src/qpid/amqp/Descriptor.h
diff --git a/cpp/src/qpid/amqp/Encoder.cpp b/qpid/cpp/src/qpid/amqp/Encoder.cpp
index 86b59fb1a2..86b59fb1a2 100644
--- a/cpp/src/qpid/amqp/Encoder.cpp
+++ b/qpid/cpp/src/qpid/amqp/Encoder.cpp
diff --git a/cpp/src/qpid/amqp/Encoder.h b/qpid/cpp/src/qpid/amqp/Encoder.h
index 8729f29b94..8729f29b94 100644
--- a/cpp/src/qpid/amqp/Encoder.h
+++ b/qpid/cpp/src/qpid/amqp/Encoder.h
diff --git a/cpp/src/qpid/amqp/ListBuilder.cpp b/qpid/cpp/src/qpid/amqp/ListBuilder.cpp
index f2ca8e8805..f2ca8e8805 100644
--- a/cpp/src/qpid/amqp/ListBuilder.cpp
+++ b/qpid/cpp/src/qpid/amqp/ListBuilder.cpp
diff --git a/cpp/src/qpid/amqp/ListBuilder.h b/qpid/cpp/src/qpid/amqp/ListBuilder.h
index 825f384f56..825f384f56 100644
--- a/cpp/src/qpid/amqp/ListBuilder.h
+++ b/qpid/cpp/src/qpid/amqp/ListBuilder.h
diff --git a/cpp/src/qpid/amqp/ListReader.h b/qpid/cpp/src/qpid/amqp/ListReader.h
index fafe2a1f9c..fafe2a1f9c 100644
--- a/cpp/src/qpid/amqp/ListReader.h
+++ b/qpid/cpp/src/qpid/amqp/ListReader.h
diff --git a/cpp/src/qpid/amqp/LoggingReader.h b/qpid/cpp/src/qpid/amqp/LoggingReader.h
index ed5cab1cbd..ed5cab1cbd 100644
--- a/cpp/src/qpid/amqp/LoggingReader.h
+++ b/qpid/cpp/src/qpid/amqp/LoggingReader.h
diff --git a/cpp/src/qpid/amqp/MapBuilder.cpp b/qpid/cpp/src/qpid/amqp/MapBuilder.cpp
index ce8eea038e..ce8eea038e 100644
--- a/cpp/src/qpid/amqp/MapBuilder.cpp
+++ b/qpid/cpp/src/qpid/amqp/MapBuilder.cpp
diff --git a/cpp/src/qpid/amqp/MapBuilder.h b/qpid/cpp/src/qpid/amqp/MapBuilder.h
index fd94ae04af..fd94ae04af 100644
--- a/cpp/src/qpid/amqp/MapBuilder.h
+++ b/qpid/cpp/src/qpid/amqp/MapBuilder.h
diff --git a/cpp/src/qpid/amqp/MapEncoder.cpp b/qpid/cpp/src/qpid/amqp/MapEncoder.cpp
index cf8ef4ecb5..cf8ef4ecb5 100644
--- a/cpp/src/qpid/amqp/MapEncoder.cpp
+++ b/qpid/cpp/src/qpid/amqp/MapEncoder.cpp
diff --git a/cpp/src/qpid/amqp/MapEncoder.h b/qpid/cpp/src/qpid/amqp/MapEncoder.h
index 1481f9125a..1481f9125a 100644
--- a/cpp/src/qpid/amqp/MapEncoder.h
+++ b/qpid/cpp/src/qpid/amqp/MapEncoder.h
diff --git a/cpp/src/qpid/amqp/MapHandler.h b/qpid/cpp/src/qpid/amqp/MapHandler.h
index 14994ccac7..14994ccac7 100644
--- a/cpp/src/qpid/amqp/MapHandler.h
+++ b/qpid/cpp/src/qpid/amqp/MapHandler.h
diff --git a/cpp/src/qpid/amqp/MapReader.cpp b/qpid/cpp/src/qpid/amqp/MapReader.cpp
index b6c31849f0..b6c31849f0 100644
--- a/cpp/src/qpid/amqp/MapReader.cpp
+++ b/qpid/cpp/src/qpid/amqp/MapReader.cpp
diff --git a/cpp/src/qpid/amqp/MapReader.h b/qpid/cpp/src/qpid/amqp/MapReader.h
index 875f919d63..875f919d63 100644
--- a/cpp/src/qpid/amqp/MapReader.h
+++ b/qpid/cpp/src/qpid/amqp/MapReader.h
diff --git a/cpp/src/qpid/amqp/MapSizeCalculator.cpp b/qpid/cpp/src/qpid/amqp/MapSizeCalculator.cpp
index 2da152108f..2da152108f 100644
--- a/cpp/src/qpid/amqp/MapSizeCalculator.cpp
+++ b/qpid/cpp/src/qpid/amqp/MapSizeCalculator.cpp
diff --git a/cpp/src/qpid/amqp/MapSizeCalculator.h b/qpid/cpp/src/qpid/amqp/MapSizeCalculator.h
index 35c9ad732d..35c9ad732d 100644
--- a/cpp/src/qpid/amqp/MapSizeCalculator.h
+++ b/qpid/cpp/src/qpid/amqp/MapSizeCalculator.h
diff --git a/cpp/src/qpid/amqp/MessageEncoder.cpp b/qpid/cpp/src/qpid/amqp/MessageEncoder.cpp
index 71e7e75111..71e7e75111 100644
--- a/cpp/src/qpid/amqp/MessageEncoder.cpp
+++ b/qpid/cpp/src/qpid/amqp/MessageEncoder.cpp
diff --git a/cpp/src/qpid/amqp/MessageEncoder.h b/qpid/cpp/src/qpid/amqp/MessageEncoder.h
index 05e1714004..05e1714004 100644
--- a/cpp/src/qpid/amqp/MessageEncoder.h
+++ b/qpid/cpp/src/qpid/amqp/MessageEncoder.h
diff --git a/cpp/src/qpid/amqp/MessageId.cpp b/qpid/cpp/src/qpid/amqp/MessageId.cpp
index 69ec4ce7f5..69ec4ce7f5 100644
--- a/cpp/src/qpid/amqp/MessageId.cpp
+++ b/qpid/cpp/src/qpid/amqp/MessageId.cpp
diff --git a/cpp/src/qpid/amqp/MessageId.h b/qpid/cpp/src/qpid/amqp/MessageId.h
index 4505469148..4505469148 100644
--- a/cpp/src/qpid/amqp/MessageId.h
+++ b/qpid/cpp/src/qpid/amqp/MessageId.h
diff --git a/cpp/src/qpid/amqp/MessageReader.cpp b/qpid/cpp/src/qpid/amqp/MessageReader.cpp
index ab90472067..ab90472067 100644
--- a/cpp/src/qpid/amqp/MessageReader.cpp
+++ b/qpid/cpp/src/qpid/amqp/MessageReader.cpp
diff --git a/cpp/src/qpid/amqp/MessageReader.h b/qpid/cpp/src/qpid/amqp/MessageReader.h
index 2fb588546f..2fb588546f 100644
--- a/cpp/src/qpid/amqp/MessageReader.h
+++ b/qpid/cpp/src/qpid/amqp/MessageReader.h
diff --git a/cpp/src/qpid/amqp/Reader.h b/qpid/cpp/src/qpid/amqp/Reader.h
index 32f33dc33f..32f33dc33f 100644
--- a/cpp/src/qpid/amqp/Reader.h
+++ b/qpid/cpp/src/qpid/amqp/Reader.h
diff --git a/cpp/src/qpid/amqp/Sasl.cpp b/qpid/cpp/src/qpid/amqp/Sasl.cpp
index a7c2eea35b..a7c2eea35b 100644
--- a/cpp/src/qpid/amqp/Sasl.cpp
+++ b/qpid/cpp/src/qpid/amqp/Sasl.cpp
diff --git a/cpp/src/qpid/amqp/Sasl.h b/qpid/cpp/src/qpid/amqp/Sasl.h
index 24a8de7dc4..24a8de7dc4 100644
--- a/cpp/src/qpid/amqp/Sasl.h
+++ b/qpid/cpp/src/qpid/amqp/Sasl.h
diff --git a/cpp/src/qpid/amqp/SaslClient.cpp b/qpid/cpp/src/qpid/amqp/SaslClient.cpp
index d8a38750c5..d8a38750c5 100644
--- a/cpp/src/qpid/amqp/SaslClient.cpp
+++ b/qpid/cpp/src/qpid/amqp/SaslClient.cpp
diff --git a/cpp/src/qpid/amqp/SaslClient.h b/qpid/cpp/src/qpid/amqp/SaslClient.h
index d22887de1a..d22887de1a 100644
--- a/cpp/src/qpid/amqp/SaslClient.h
+++ b/qpid/cpp/src/qpid/amqp/SaslClient.h
diff --git a/cpp/src/qpid/amqp/SaslServer.cpp b/qpid/cpp/src/qpid/amqp/SaslServer.cpp
index 250858bda0..250858bda0 100644
--- a/cpp/src/qpid/amqp/SaslServer.cpp
+++ b/qpid/cpp/src/qpid/amqp/SaslServer.cpp
diff --git a/cpp/src/qpid/amqp/SaslServer.h b/qpid/cpp/src/qpid/amqp/SaslServer.h
index 68d0854488..68d0854488 100644
--- a/cpp/src/qpid/amqp/SaslServer.h
+++ b/qpid/cpp/src/qpid/amqp/SaslServer.h
diff --git a/cpp/src/qpid/amqp/descriptors.h b/qpid/cpp/src/qpid/amqp/descriptors.h
index 29c626edc2..29c626edc2 100644
--- a/cpp/src/qpid/amqp/descriptors.h
+++ b/qpid/cpp/src/qpid/amqp/descriptors.h
diff --git a/cpp/src/qpid/amqp/typecodes.h b/qpid/cpp/src/qpid/amqp/typecodes.h
index 915b75ca3f..915b75ca3f 100644
--- a/cpp/src/qpid/amqp/typecodes.h
+++ b/qpid/cpp/src/qpid/amqp/typecodes.h
diff --git a/cpp/src/qpid/amqp_0_10/Codecs.cpp b/qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp
index 49d152cc05..49d152cc05 100644
--- a/cpp/src/qpid/amqp_0_10/Codecs.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/Codecs.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Codecs.h b/qpid/cpp/src/qpid/amqp_0_10/Codecs.h
index 79d76bcc4b..79d76bcc4b 100644
--- a/cpp/src/qpid/amqp_0_10/Codecs.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Codecs.h
diff --git a/cpp/src/qpid/amqp_0_10/CodecsInternal.h b/qpid/cpp/src/qpid/amqp_0_10/CodecsInternal.h
index cf9a7d0447..cf9a7d0447 100644
--- a/cpp/src/qpid/amqp_0_10/CodecsInternal.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/CodecsInternal.h
diff --git a/cpp/src/qpid/amqp_0_10/Connection.cpp b/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
index 866f98071b..866f98071b 100644
--- a/cpp/src/qpid/amqp_0_10/Connection.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
diff --git a/cpp/src/qpid/amqp_0_10/Connection.h b/qpid/cpp/src/qpid/amqp_0_10/Connection.h
index 5f58df307d..5f58df307d 100644
--- a/cpp/src/qpid/amqp_0_10/Connection.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/Connection.h
diff --git a/cpp/src/qpid/amqp_0_10/SessionHandler.cpp b/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
index bd0dcbfc85..bd0dcbfc85 100644
--- a/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.cpp
diff --git a/cpp/src/qpid/amqp_0_10/SessionHandler.h b/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.h
index 8b072fa05c..8b072fa05c 100644
--- a/cpp/src/qpid/amqp_0_10/SessionHandler.h
+++ b/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.h
diff --git a/cpp/src/qpid/assert.cpp b/qpid/cpp/src/qpid/assert.cpp
index 801bfa6ae5..801bfa6ae5 100644
--- a/cpp/src/qpid/assert.cpp
+++ b/qpid/cpp/src/qpid/assert.cpp
diff --git a/cpp/src/qpid/assert.h b/qpid/cpp/src/qpid/assert.h
index 49e7c5355d..49e7c5355d 100644
--- a/cpp/src/qpid/assert.h
+++ b/qpid/cpp/src/qpid/assert.h
diff --git a/cpp/src/qpid/broker/AclModule.h b/qpid/cpp/src/qpid/broker/AclModule.h
index 6f3b69390b..6f3b69390b 100644
--- a/cpp/src/qpid/broker/AclModule.h
+++ b/qpid/cpp/src/qpid/broker/AclModule.h
diff --git a/cpp/src/qpid/broker/AsyncCommandCallback.cpp b/qpid/cpp/src/qpid/broker/AsyncCommandCallback.cpp
index 0b52c6b5c5..0b52c6b5c5 100644
--- a/cpp/src/qpid/broker/AsyncCommandCallback.cpp
+++ b/qpid/cpp/src/qpid/broker/AsyncCommandCallback.cpp
diff --git a/cpp/src/qpid/broker/AsyncCommandCallback.h b/qpid/cpp/src/qpid/broker/AsyncCommandCallback.h
index 15884ae8d9..15884ae8d9 100644
--- a/cpp/src/qpid/broker/AsyncCommandCallback.h
+++ b/qpid/cpp/src/qpid/broker/AsyncCommandCallback.h
diff --git a/cpp/src/qpid/broker/AsyncCompletion.h b/qpid/cpp/src/qpid/broker/AsyncCompletion.h
index cb5d58977b..cb5d58977b 100644
--- a/cpp/src/qpid/broker/AsyncCompletion.h
+++ b/qpid/cpp/src/qpid/broker/AsyncCompletion.h
diff --git a/cpp/src/qpid/broker/Bridge.cpp b/qpid/cpp/src/qpid/broker/Bridge.cpp
index 06d3a0dd52..06d3a0dd52 100644
--- a/cpp/src/qpid/broker/Bridge.cpp
+++ b/qpid/cpp/src/qpid/broker/Bridge.cpp
diff --git a/cpp/src/qpid/broker/Bridge.h b/qpid/cpp/src/qpid/broker/Bridge.h
index 3eac8f2af2..3eac8f2af2 100644
--- a/cpp/src/qpid/broker/Bridge.h
+++ b/qpid/cpp/src/qpid/broker/Bridge.h
diff --git a/cpp/src/qpid/broker/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index 622681ab2a..622681ab2a 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
diff --git a/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h
index af1144eeb0..af1144eeb0 100644
--- a/cpp/src/qpid/broker/Broker.h
+++ b/qpid/cpp/src/qpid/broker/Broker.h
diff --git a/cpp/src/qpid/broker/BrokerImportExport.h b/qpid/cpp/src/qpid/broker/BrokerImportExport.h
index ee05788063..ee05788063 100644
--- a/cpp/src/qpid/broker/BrokerImportExport.h
+++ b/qpid/cpp/src/qpid/broker/BrokerImportExport.h
diff --git a/cpp/src/qpid/broker/BrokerObserver.h b/qpid/cpp/src/qpid/broker/BrokerObserver.h
index a9573b9e12..a9573b9e12 100644
--- a/cpp/src/qpid/broker/BrokerObserver.h
+++ b/qpid/cpp/src/qpid/broker/BrokerObserver.h
diff --git a/cpp/src/qpid/broker/BrokerObservers.h b/qpid/cpp/src/qpid/broker/BrokerObservers.h
index 67427adcb1..67427adcb1 100644
--- a/cpp/src/qpid/broker/BrokerObservers.h
+++ b/qpid/cpp/src/qpid/broker/BrokerObservers.h
diff --git a/cpp/src/qpid/broker/BrokerOptions.h b/qpid/cpp/src/qpid/broker/BrokerOptions.h
index 7207c17f91..7207c17f91 100644
--- a/cpp/src/qpid/broker/BrokerOptions.h
+++ b/qpid/cpp/src/qpid/broker/BrokerOptions.h
diff --git a/cpp/src/qpid/broker/Connection.h b/qpid/cpp/src/qpid/broker/Connection.h
index 8cab18f37b..8cab18f37b 100644
--- a/cpp/src/qpid/broker/Connection.h
+++ b/qpid/cpp/src/qpid/broker/Connection.h
diff --git a/cpp/src/qpid/broker/ConnectionHandler.cpp b/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
index 49afd8d24d..49afd8d24d 100644
--- a/cpp/src/qpid/broker/ConnectionHandler.cpp
+++ b/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
diff --git a/cpp/src/qpid/broker/ConnectionHandler.h b/qpid/cpp/src/qpid/broker/ConnectionHandler.h
index 93bd62d5d0..93bd62d5d0 100644
--- a/cpp/src/qpid/broker/ConnectionHandler.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionHandler.h
diff --git a/cpp/src/qpid/broker/ConnectionObserver.h b/qpid/cpp/src/qpid/broker/ConnectionObserver.h
index eea2981185..eea2981185 100644
--- a/cpp/src/qpid/broker/ConnectionObserver.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionObserver.h
diff --git a/cpp/src/qpid/broker/ConnectionObservers.h b/qpid/cpp/src/qpid/broker/ConnectionObservers.h
index 8b9fb67aa5..8b9fb67aa5 100644
--- a/cpp/src/qpid/broker/ConnectionObservers.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionObservers.h
diff --git a/cpp/src/qpid/broker/Consumer.h b/qpid/cpp/src/qpid/broker/Consumer.h
index 4a0621243c..4a0621243c 100644
--- a/cpp/src/qpid/broker/Consumer.h
+++ b/qpid/cpp/src/qpid/broker/Consumer.h
diff --git a/cpp/src/qpid/broker/ConsumerFactory.h b/qpid/cpp/src/qpid/broker/ConsumerFactory.h
index 1c0f2571e2..1c0f2571e2 100644
--- a/cpp/src/qpid/broker/ConsumerFactory.h
+++ b/qpid/cpp/src/qpid/broker/ConsumerFactory.h
diff --git a/cpp/src/qpid/broker/Credit.cpp b/qpid/cpp/src/qpid/broker/Credit.cpp
index c0e0b3b3d3..c0e0b3b3d3 100644
--- a/cpp/src/qpid/broker/Credit.cpp
+++ b/qpid/cpp/src/qpid/broker/Credit.cpp
diff --git a/cpp/src/qpid/broker/Credit.h b/qpid/cpp/src/qpid/broker/Credit.h
index 7f98c8d071..7f98c8d071 100644
--- a/cpp/src/qpid/broker/Credit.h
+++ b/qpid/cpp/src/qpid/broker/Credit.h
diff --git a/cpp/src/qpid/broker/Daemon.cpp b/qpid/cpp/src/qpid/broker/Daemon.cpp
index 9f7a5b3f2d..9f7a5b3f2d 100644
--- a/cpp/src/qpid/broker/Daemon.cpp
+++ b/qpid/cpp/src/qpid/broker/Daemon.cpp
diff --git a/cpp/src/qpid/broker/Daemon.h b/qpid/cpp/src/qpid/broker/Daemon.h
index 2bb9fc5577..2bb9fc5577 100644
--- a/cpp/src/qpid/broker/Daemon.h
+++ b/qpid/cpp/src/qpid/broker/Daemon.h
diff --git a/cpp/src/qpid/broker/Deliverable.h b/qpid/cpp/src/qpid/broker/Deliverable.h
index 4dc67fdcfc..4dc67fdcfc 100644
--- a/cpp/src/qpid/broker/Deliverable.h
+++ b/qpid/cpp/src/qpid/broker/Deliverable.h
diff --git a/cpp/src/qpid/broker/DeliverableMessage.cpp b/qpid/cpp/src/qpid/broker/DeliverableMessage.cpp
index 31823709ce..31823709ce 100644
--- a/cpp/src/qpid/broker/DeliverableMessage.cpp
+++ b/qpid/cpp/src/qpid/broker/DeliverableMessage.cpp
diff --git a/cpp/src/qpid/broker/DeliverableMessage.h b/qpid/cpp/src/qpid/broker/DeliverableMessage.h
index 6e8275770d..6e8275770d 100644
--- a/cpp/src/qpid/broker/DeliverableMessage.h
+++ b/qpid/cpp/src/qpid/broker/DeliverableMessage.h
diff --git a/cpp/src/qpid/broker/DeliveryId.h b/qpid/cpp/src/qpid/broker/DeliveryId.h
index 05b19f032e..05b19f032e 100644
--- a/cpp/src/qpid/broker/DeliveryId.h
+++ b/qpid/cpp/src/qpid/broker/DeliveryId.h
diff --git a/cpp/src/qpid/broker/DeliveryRecord.cpp b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
index 06ecf62ed4..06ecf62ed4 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
diff --git a/cpp/src/qpid/broker/DeliveryRecord.h b/qpid/cpp/src/qpid/broker/DeliveryRecord.h
index 37ce8dc709..37ce8dc709 100644
--- a/cpp/src/qpid/broker/DeliveryRecord.h
+++ b/qpid/cpp/src/qpid/broker/DeliveryRecord.h
diff --git a/cpp/src/qpid/broker/DirectExchange.cpp b/qpid/cpp/src/qpid/broker/DirectExchange.cpp
index be66bc2e5f..be66bc2e5f 100644
--- a/cpp/src/qpid/broker/DirectExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/DirectExchange.cpp
diff --git a/cpp/src/qpid/broker/DirectExchange.h b/qpid/cpp/src/qpid/broker/DirectExchange.h
index cbf9aa5975..cbf9aa5975 100644
--- a/cpp/src/qpid/broker/DirectExchange.h
+++ b/qpid/cpp/src/qpid/broker/DirectExchange.h
diff --git a/cpp/src/qpid/broker/DtxAck.cpp b/qpid/cpp/src/qpid/broker/DtxAck.cpp
index c558681d62..c558681d62 100644
--- a/cpp/src/qpid/broker/DtxAck.cpp
+++ b/qpid/cpp/src/qpid/broker/DtxAck.cpp
diff --git a/cpp/src/qpid/broker/DtxAck.h b/qpid/cpp/src/qpid/broker/DtxAck.h
index 5775edf5de..5775edf5de 100644
--- a/cpp/src/qpid/broker/DtxAck.h
+++ b/qpid/cpp/src/qpid/broker/DtxAck.h
diff --git a/cpp/src/qpid/broker/DtxBuffer.cpp b/qpid/cpp/src/qpid/broker/DtxBuffer.cpp
index 13177d3b72..13177d3b72 100644
--- a/cpp/src/qpid/broker/DtxBuffer.cpp
+++ b/qpid/cpp/src/qpid/broker/DtxBuffer.cpp
diff --git a/cpp/src/qpid/broker/DtxBuffer.h b/qpid/cpp/src/qpid/broker/DtxBuffer.h
index 21ca76c8f4..21ca76c8f4 100644
--- a/cpp/src/qpid/broker/DtxBuffer.h
+++ b/qpid/cpp/src/qpid/broker/DtxBuffer.h
diff --git a/cpp/src/qpid/broker/DtxManager.cpp b/qpid/cpp/src/qpid/broker/DtxManager.cpp
index 4fb82bb41b..4fb82bb41b 100644
--- a/cpp/src/qpid/broker/DtxManager.cpp
+++ b/qpid/cpp/src/qpid/broker/DtxManager.cpp
diff --git a/cpp/src/qpid/broker/DtxManager.h b/qpid/cpp/src/qpid/broker/DtxManager.h
index e64c97c7dd..e64c97c7dd 100644
--- a/cpp/src/qpid/broker/DtxManager.h
+++ b/qpid/cpp/src/qpid/broker/DtxManager.h
diff --git a/cpp/src/qpid/broker/DtxTimeout.cpp b/qpid/cpp/src/qpid/broker/DtxTimeout.cpp
index f317df5713..f317df5713 100644
--- a/cpp/src/qpid/broker/DtxTimeout.cpp
+++ b/qpid/cpp/src/qpid/broker/DtxTimeout.cpp
diff --git a/cpp/src/qpid/broker/DtxTimeout.h b/qpid/cpp/src/qpid/broker/DtxTimeout.h
index 1fcb4cee2a..1fcb4cee2a 100644
--- a/cpp/src/qpid/broker/DtxTimeout.h
+++ b/qpid/cpp/src/qpid/broker/DtxTimeout.h
diff --git a/cpp/src/qpid/broker/DtxWorkRecord.cpp b/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp
index 04d19dc43e..04d19dc43e 100644
--- a/cpp/src/qpid/broker/DtxWorkRecord.cpp
+++ b/qpid/cpp/src/qpid/broker/DtxWorkRecord.cpp
diff --git a/cpp/src/qpid/broker/DtxWorkRecord.h b/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
index 91fda797d1..91fda797d1 100644
--- a/cpp/src/qpid/broker/DtxWorkRecord.h
+++ b/qpid/cpp/src/qpid/broker/DtxWorkRecord.h
diff --git a/cpp/src/qpid/broker/Exchange.cpp b/qpid/cpp/src/qpid/broker/Exchange.cpp
index c9ed648735..c9ed648735 100644
--- a/cpp/src/qpid/broker/Exchange.cpp
+++ b/qpid/cpp/src/qpid/broker/Exchange.cpp
diff --git a/cpp/src/qpid/broker/Exchange.h b/qpid/cpp/src/qpid/broker/Exchange.h
index 3308d54e1b..3308d54e1b 100644
--- a/cpp/src/qpid/broker/Exchange.h
+++ b/qpid/cpp/src/qpid/broker/Exchange.h
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
index 73f1c80f48..73f1c80f48 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.h b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
index fc741dce27..fc741dce27 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.h
+++ b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
diff --git a/cpp/src/qpid/broker/Fairshare.cpp b/qpid/cpp/src/qpid/broker/Fairshare.cpp
index ec8ae9a037..ec8ae9a037 100644
--- a/cpp/src/qpid/broker/Fairshare.cpp
+++ b/qpid/cpp/src/qpid/broker/Fairshare.cpp
diff --git a/cpp/src/qpid/broker/Fairshare.h b/qpid/cpp/src/qpid/broker/Fairshare.h
index e7c8b04ecf..e7c8b04ecf 100644
--- a/cpp/src/qpid/broker/Fairshare.h
+++ b/qpid/cpp/src/qpid/broker/Fairshare.h
diff --git a/cpp/src/qpid/broker/FanOutExchange.cpp b/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
index 8c1d3f4954..8c1d3f4954 100644
--- a/cpp/src/qpid/broker/FanOutExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
diff --git a/cpp/src/qpid/broker/FanOutExchange.h b/qpid/cpp/src/qpid/broker/FanOutExchange.h
index a92ff7ce97..a92ff7ce97 100644
--- a/cpp/src/qpid/broker/FanOutExchange.h
+++ b/qpid/cpp/src/qpid/broker/FanOutExchange.h
diff --git a/cpp/src/qpid/broker/FedOps.h b/qpid/cpp/src/qpid/broker/FedOps.h
index dc4a38e244..dc4a38e244 100644
--- a/cpp/src/qpid/broker/FedOps.h
+++ b/qpid/cpp/src/qpid/broker/FedOps.h
diff --git a/cpp/src/qpid/broker/FifoDistributor.cpp b/qpid/cpp/src/qpid/broker/FifoDistributor.cpp
index e1c0d268ce..e1c0d268ce 100644
--- a/cpp/src/qpid/broker/FifoDistributor.cpp
+++ b/qpid/cpp/src/qpid/broker/FifoDistributor.cpp
diff --git a/cpp/src/qpid/broker/FifoDistributor.h b/qpid/cpp/src/qpid/broker/FifoDistributor.h
index aa5ebe28c5..aa5ebe28c5 100644
--- a/cpp/src/qpid/broker/FifoDistributor.h
+++ b/qpid/cpp/src/qpid/broker/FifoDistributor.h
diff --git a/cpp/src/qpid/broker/HandlerImpl.h b/qpid/cpp/src/qpid/broker/HandlerImpl.h
index c41438fd90..c41438fd90 100644
--- a/cpp/src/qpid/broker/HandlerImpl.h
+++ b/qpid/cpp/src/qpid/broker/HandlerImpl.h
diff --git a/cpp/src/qpid/broker/HeadersExchange.cpp b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
index 585c7ba764..585c7ba764 100644
--- a/cpp/src/qpid/broker/HeadersExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
diff --git a/cpp/src/qpid/broker/HeadersExchange.h b/qpid/cpp/src/qpid/broker/HeadersExchange.h
index 54c69491e9..54c69491e9 100644
--- a/cpp/src/qpid/broker/HeadersExchange.h
+++ b/qpid/cpp/src/qpid/broker/HeadersExchange.h
diff --git a/cpp/src/qpid/broker/IndexedDeque.h b/qpid/cpp/src/qpid/broker/IndexedDeque.h
index 229b4e3009..229b4e3009 100644
--- a/cpp/src/qpid/broker/IndexedDeque.h
+++ b/qpid/cpp/src/qpid/broker/IndexedDeque.h
diff --git a/cpp/src/qpid/broker/IngressCompletion.cpp b/qpid/cpp/src/qpid/broker/IngressCompletion.cpp
index 51eafb8d86..51eafb8d86 100644
--- a/cpp/src/qpid/broker/IngressCompletion.cpp
+++ b/qpid/cpp/src/qpid/broker/IngressCompletion.cpp
diff --git a/cpp/src/qpid/broker/IngressCompletion.h b/qpid/cpp/src/qpid/broker/IngressCompletion.h
index ca21ec9837..ca21ec9837 100644
--- a/cpp/src/qpid/broker/IngressCompletion.h
+++ b/qpid/cpp/src/qpid/broker/IngressCompletion.h
diff --git a/cpp/src/qpid/broker/Link.cpp b/qpid/cpp/src/qpid/broker/Link.cpp
index 9b85917251..9b85917251 100644
--- a/cpp/src/qpid/broker/Link.cpp
+++ b/qpid/cpp/src/qpid/broker/Link.cpp
diff --git a/cpp/src/qpid/broker/Link.h b/qpid/cpp/src/qpid/broker/Link.h
index ceee0186f3..ceee0186f3 100644
--- a/cpp/src/qpid/broker/Link.h
+++ b/qpid/cpp/src/qpid/broker/Link.h
diff --git a/cpp/src/qpid/broker/LinkRegistry.cpp b/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
index b3a78b98ca..b3a78b98ca 100644
--- a/cpp/src/qpid/broker/LinkRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
diff --git a/cpp/src/qpid/broker/LinkRegistry.h b/qpid/cpp/src/qpid/broker/LinkRegistry.h
index a156a53624..a156a53624 100644
--- a/cpp/src/qpid/broker/LinkRegistry.h
+++ b/qpid/cpp/src/qpid/broker/LinkRegistry.h
diff --git a/cpp/src/qpid/broker/LossyLvq.cpp b/qpid/cpp/src/qpid/broker/LossyLvq.cpp
index f59ecc1925..f59ecc1925 100644
--- a/cpp/src/qpid/broker/LossyLvq.cpp
+++ b/qpid/cpp/src/qpid/broker/LossyLvq.cpp
diff --git a/cpp/src/qpid/broker/LossyLvq.h b/qpid/cpp/src/qpid/broker/LossyLvq.h
index 2665ebe49f..2665ebe49f 100644
--- a/cpp/src/qpid/broker/LossyLvq.h
+++ b/qpid/cpp/src/qpid/broker/LossyLvq.h
diff --git a/cpp/src/qpid/broker/LossyQueue.cpp b/qpid/cpp/src/qpid/broker/LossyQueue.cpp
index ee13d7733a..ee13d7733a 100644
--- a/cpp/src/qpid/broker/LossyQueue.cpp
+++ b/qpid/cpp/src/qpid/broker/LossyQueue.cpp
diff --git a/cpp/src/qpid/broker/LossyQueue.h b/qpid/cpp/src/qpid/broker/LossyQueue.h
index 705865f449..705865f449 100644
--- a/cpp/src/qpid/broker/LossyQueue.h
+++ b/qpid/cpp/src/qpid/broker/LossyQueue.h
diff --git a/cpp/src/qpid/broker/Lvq.cpp b/qpid/cpp/src/qpid/broker/Lvq.cpp
index 34f080c57f..34f080c57f 100644
--- a/cpp/src/qpid/broker/Lvq.cpp
+++ b/qpid/cpp/src/qpid/broker/Lvq.cpp
diff --git a/cpp/src/qpid/broker/Lvq.h b/qpid/cpp/src/qpid/broker/Lvq.h
index 26ba2b4914..26ba2b4914 100644
--- a/cpp/src/qpid/broker/Lvq.h
+++ b/qpid/cpp/src/qpid/broker/Lvq.h
diff --git a/cpp/src/qpid/broker/Message.cpp b/qpid/cpp/src/qpid/broker/Message.cpp
index 250acf6b4e..250acf6b4e 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/qpid/cpp/src/qpid/broker/Message.cpp
diff --git a/cpp/src/qpid/broker/Message.h b/qpid/cpp/src/qpid/broker/Message.h
index 9843bc6220..9843bc6220 100644
--- a/cpp/src/qpid/broker/Message.h
+++ b/qpid/cpp/src/qpid/broker/Message.h
diff --git a/cpp/src/qpid/broker/MessageAdapter.cpp b/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
index 489386f82e..489386f82e 100644
--- a/cpp/src/qpid/broker/MessageAdapter.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageAdapter.cpp
diff --git a/cpp/src/qpid/broker/MessageAdapter.h b/qpid/cpp/src/qpid/broker/MessageAdapter.h
index df50db4063..df50db4063 100644
--- a/cpp/src/qpid/broker/MessageAdapter.h
+++ b/qpid/cpp/src/qpid/broker/MessageAdapter.h
diff --git a/cpp/src/qpid/broker/MessageBuilder.cpp b/qpid/cpp/src/qpid/broker/MessageBuilder.cpp
index f5e9332052..f5e9332052 100644
--- a/cpp/src/qpid/broker/MessageBuilder.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageBuilder.cpp
diff --git a/cpp/src/qpid/broker/MessageBuilder.h b/qpid/cpp/src/qpid/broker/MessageBuilder.h
index 5673ed3b7f..5673ed3b7f 100644
--- a/cpp/src/qpid/broker/MessageBuilder.h
+++ b/qpid/cpp/src/qpid/broker/MessageBuilder.h
diff --git a/cpp/src/qpid/broker/MessageDeque.cpp b/qpid/cpp/src/qpid/broker/MessageDeque.cpp
index 1529d4ac94..1529d4ac94 100644
--- a/cpp/src/qpid/broker/MessageDeque.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageDeque.cpp
diff --git a/cpp/src/qpid/broker/MessageDeque.h b/qpid/cpp/src/qpid/broker/MessageDeque.h
index ec67476926..ec67476926 100644
--- a/cpp/src/qpid/broker/MessageDeque.h
+++ b/qpid/cpp/src/qpid/broker/MessageDeque.h
diff --git a/cpp/src/qpid/broker/MessageDistributor.h b/qpid/cpp/src/qpid/broker/MessageDistributor.h
index c11e4495a1..c11e4495a1 100644
--- a/cpp/src/qpid/broker/MessageDistributor.h
+++ b/qpid/cpp/src/qpid/broker/MessageDistributor.h
diff --git a/cpp/src/qpid/broker/MessageGroupManager.cpp b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
index c083e4ee0f..c083e4ee0f 100644
--- a/cpp/src/qpid/broker/MessageGroupManager.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageGroupManager.cpp
diff --git a/cpp/src/qpid/broker/MessageGroupManager.h b/qpid/cpp/src/qpid/broker/MessageGroupManager.h
index bf45e776c8..bf45e776c8 100644
--- a/cpp/src/qpid/broker/MessageGroupManager.h
+++ b/qpid/cpp/src/qpid/broker/MessageGroupManager.h
diff --git a/cpp/src/qpid/broker/MessageInterceptor.h b/qpid/cpp/src/qpid/broker/MessageInterceptor.h
index 3ada86b6f7..3ada86b6f7 100644
--- a/cpp/src/qpid/broker/MessageInterceptor.h
+++ b/qpid/cpp/src/qpid/broker/MessageInterceptor.h
diff --git a/cpp/src/qpid/broker/MessageMap.cpp b/qpid/cpp/src/qpid/broker/MessageMap.cpp
index 4cdd83c9aa..4cdd83c9aa 100644
--- a/cpp/src/qpid/broker/MessageMap.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageMap.cpp
diff --git a/cpp/src/qpid/broker/MessageMap.h b/qpid/cpp/src/qpid/broker/MessageMap.h
index c30606d0ff..c30606d0ff 100644
--- a/cpp/src/qpid/broker/MessageMap.h
+++ b/qpid/cpp/src/qpid/broker/MessageMap.h
diff --git a/cpp/src/qpid/broker/MessageStore.h b/qpid/cpp/src/qpid/broker/MessageStore.h
index 4f7e9f3d5f..4f7e9f3d5f 100644
--- a/cpp/src/qpid/broker/MessageStore.h
+++ b/qpid/cpp/src/qpid/broker/MessageStore.h
diff --git a/cpp/src/qpid/broker/MessageStoreModule.cpp b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
index 556ecc3084..556ecc3084 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
diff --git a/cpp/src/qpid/broker/MessageStoreModule.h b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
index ca7de3d318..ca7de3d318 100644
--- a/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
diff --git a/cpp/src/qpid/broker/Messages.h b/qpid/cpp/src/qpid/broker/Messages.h
index cd846a4973..cd846a4973 100644
--- a/cpp/src/qpid/broker/Messages.h
+++ b/qpid/cpp/src/qpid/broker/Messages.h
diff --git a/cpp/src/qpid/broker/NameGenerator.cpp b/qpid/cpp/src/qpid/broker/NameGenerator.cpp
index e7f193d546..e7f193d546 100644
--- a/cpp/src/qpid/broker/NameGenerator.cpp
+++ b/qpid/cpp/src/qpid/broker/NameGenerator.cpp
diff --git a/cpp/src/qpid/broker/NameGenerator.h b/qpid/cpp/src/qpid/broker/NameGenerator.h
index 2e9f7febe2..2e9f7febe2 100644
--- a/cpp/src/qpid/broker/NameGenerator.h
+++ b/qpid/cpp/src/qpid/broker/NameGenerator.h
diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
index f2ff7d0e6e..f2ff7d0e6e 100644
--- a/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
diff --git a/cpp/src/qpid/broker/NullMessageStore.h b/qpid/cpp/src/qpid/broker/NullMessageStore.h
index 9f394d1fde..9f394d1fde 100644
--- a/cpp/src/qpid/broker/NullMessageStore.h
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.h
diff --git a/cpp/src/qpid/broker/ObjectFactory.cpp b/qpid/cpp/src/qpid/broker/ObjectFactory.cpp
index 39edaa9fab..39edaa9fab 100644
--- a/cpp/src/qpid/broker/ObjectFactory.cpp
+++ b/qpid/cpp/src/qpid/broker/ObjectFactory.cpp
diff --git a/cpp/src/qpid/broker/ObjectFactory.h b/qpid/cpp/src/qpid/broker/ObjectFactory.h
index d1b570da2f..d1b570da2f 100644
--- a/cpp/src/qpid/broker/ObjectFactory.h
+++ b/qpid/cpp/src/qpid/broker/ObjectFactory.h
diff --git a/cpp/src/qpid/broker/Observers.h b/qpid/cpp/src/qpid/broker/Observers.h
index efed377b33..efed377b33 100644
--- a/cpp/src/qpid/broker/Observers.h
+++ b/qpid/cpp/src/qpid/broker/Observers.h
diff --git a/cpp/src/qpid/broker/OwnershipToken.h b/qpid/cpp/src/qpid/broker/OwnershipToken.h
index 2fc51408b6..2fc51408b6 100644
--- a/cpp/src/qpid/broker/OwnershipToken.h
+++ b/qpid/cpp/src/qpid/broker/OwnershipToken.h
diff --git a/cpp/src/qpid/broker/PagedQueue.cpp b/qpid/cpp/src/qpid/broker/PagedQueue.cpp
index b5edfb89c0..b5edfb89c0 100644
--- a/cpp/src/qpid/broker/PagedQueue.cpp
+++ b/qpid/cpp/src/qpid/broker/PagedQueue.cpp
diff --git a/cpp/src/qpid/broker/PagedQueue.h b/qpid/cpp/src/qpid/broker/PagedQueue.h
index c8a9f13fc7..c8a9f13fc7 100644
--- a/cpp/src/qpid/broker/PagedQueue.h
+++ b/qpid/cpp/src/qpid/broker/PagedQueue.h
diff --git a/cpp/src/qpid/broker/Persistable.h b/qpid/cpp/src/qpid/broker/Persistable.h
index 444aca3295..444aca3295 100644
--- a/cpp/src/qpid/broker/Persistable.h
+++ b/qpid/cpp/src/qpid/broker/Persistable.h
diff --git a/cpp/src/qpid/broker/PersistableConfig.h b/qpid/cpp/src/qpid/broker/PersistableConfig.h
index 8ddb84d129..8ddb84d129 100644
--- a/cpp/src/qpid/broker/PersistableConfig.h
+++ b/qpid/cpp/src/qpid/broker/PersistableConfig.h
diff --git a/cpp/src/qpid/broker/PersistableExchange.h b/qpid/cpp/src/qpid/broker/PersistableExchange.h
index e1a0853247..e1a0853247 100644
--- a/cpp/src/qpid/broker/PersistableExchange.h
+++ b/qpid/cpp/src/qpid/broker/PersistableExchange.h
diff --git a/cpp/src/qpid/broker/PersistableMessage.cpp b/qpid/cpp/src/qpid/broker/PersistableMessage.cpp
index afc0976d61..afc0976d61 100644
--- a/cpp/src/qpid/broker/PersistableMessage.cpp
+++ b/qpid/cpp/src/qpid/broker/PersistableMessage.cpp
diff --git a/cpp/src/qpid/broker/PersistableMessage.h b/qpid/cpp/src/qpid/broker/PersistableMessage.h
index cfcf8f0afc..cfcf8f0afc 100644
--- a/cpp/src/qpid/broker/PersistableMessage.h
+++ b/qpid/cpp/src/qpid/broker/PersistableMessage.h
diff --git a/cpp/src/qpid/broker/PersistableObject.cpp b/qpid/cpp/src/qpid/broker/PersistableObject.cpp
index 575ef09270..575ef09270 100644
--- a/cpp/src/qpid/broker/PersistableObject.cpp
+++ b/qpid/cpp/src/qpid/broker/PersistableObject.cpp
diff --git a/cpp/src/qpid/broker/PersistableObject.h b/qpid/cpp/src/qpid/broker/PersistableObject.h
index da4bd44601..da4bd44601 100644
--- a/cpp/src/qpid/broker/PersistableObject.h
+++ b/qpid/cpp/src/qpid/broker/PersistableObject.h
diff --git a/cpp/src/qpid/broker/PersistableQueue.h b/qpid/cpp/src/qpid/broker/PersistableQueue.h
index 6733163084..6733163084 100644
--- a/cpp/src/qpid/broker/PersistableQueue.h
+++ b/qpid/cpp/src/qpid/broker/PersistableQueue.h
diff --git a/cpp/src/qpid/broker/PriorityQueue.cpp b/qpid/cpp/src/qpid/broker/PriorityQueue.cpp
index 5e60fe5cce..5e60fe5cce 100644
--- a/cpp/src/qpid/broker/PriorityQueue.cpp
+++ b/qpid/cpp/src/qpid/broker/PriorityQueue.cpp
diff --git a/cpp/src/qpid/broker/PriorityQueue.h b/qpid/cpp/src/qpid/broker/PriorityQueue.h
index 16432bfb54..16432bfb54 100644
--- a/cpp/src/qpid/broker/PriorityQueue.h
+++ b/qpid/cpp/src/qpid/broker/PriorityQueue.h
diff --git a/cpp/src/qpid/broker/Protocol.cpp b/qpid/cpp/src/qpid/broker/Protocol.cpp
index e9e7892499..e9e7892499 100644
--- a/cpp/src/qpid/broker/Protocol.cpp
+++ b/qpid/cpp/src/qpid/broker/Protocol.cpp
diff --git a/cpp/src/qpid/broker/Protocol.h b/qpid/cpp/src/qpid/broker/Protocol.h
index a7dbc98fff..a7dbc98fff 100644
--- a/cpp/src/qpid/broker/Protocol.h
+++ b/qpid/cpp/src/qpid/broker/Protocol.h
diff --git a/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 97b5a75e28..97b5a75e28 100644
--- a/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
diff --git a/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index efca9b9d40..efca9b9d40 100644
--- a/cpp/src/qpid/broker/Queue.h
+++ b/qpid/cpp/src/qpid/broker/Queue.h
diff --git a/cpp/src/qpid/broker/QueueBindings.cpp b/qpid/cpp/src/qpid/broker/QueueBindings.cpp
index 1cc3486d9a..1cc3486d9a 100644
--- a/cpp/src/qpid/broker/QueueBindings.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueBindings.cpp
diff --git a/cpp/src/qpid/broker/QueueBindings.h b/qpid/cpp/src/qpid/broker/QueueBindings.h
index f9b07e7431..f9b07e7431 100644
--- a/cpp/src/qpid/broker/QueueBindings.h
+++ b/qpid/cpp/src/qpid/broker/QueueBindings.h
diff --git a/cpp/src/qpid/broker/QueueCleaner.cpp b/qpid/cpp/src/qpid/broker/QueueCleaner.cpp
index bf4b62c849..bf4b62c849 100644
--- a/cpp/src/qpid/broker/QueueCleaner.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueCleaner.cpp
diff --git a/cpp/src/qpid/broker/QueueCleaner.h b/qpid/cpp/src/qpid/broker/QueueCleaner.h
index 499326460f..499326460f 100644
--- a/cpp/src/qpid/broker/QueueCleaner.h
+++ b/qpid/cpp/src/qpid/broker/QueueCleaner.h
diff --git a/cpp/src/qpid/broker/QueueCursor.cpp b/qpid/cpp/src/qpid/broker/QueueCursor.cpp
index e48b18b748..e48b18b748 100644
--- a/cpp/src/qpid/broker/QueueCursor.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueCursor.cpp
diff --git a/cpp/src/qpid/broker/QueueCursor.h b/qpid/cpp/src/qpid/broker/QueueCursor.h
index c7368177e9..c7368177e9 100644
--- a/cpp/src/qpid/broker/QueueCursor.h
+++ b/qpid/cpp/src/qpid/broker/QueueCursor.h
diff --git a/cpp/src/qpid/broker/QueueDepth.cpp b/qpid/cpp/src/qpid/broker/QueueDepth.cpp
index 69ec0ab4ac..69ec0ab4ac 100644
--- a/cpp/src/qpid/broker/QueueDepth.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueDepth.cpp
diff --git a/cpp/src/qpid/broker/QueueDepth.h b/qpid/cpp/src/qpid/broker/QueueDepth.h
index d93acb2a7a..d93acb2a7a 100644
--- a/cpp/src/qpid/broker/QueueDepth.h
+++ b/qpid/cpp/src/qpid/broker/QueueDepth.h
diff --git a/cpp/src/qpid/broker/QueueFactory.cpp b/qpid/cpp/src/qpid/broker/QueueFactory.cpp
index 16cdea3b0a..16cdea3b0a 100644
--- a/cpp/src/qpid/broker/QueueFactory.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueFactory.cpp
diff --git a/cpp/src/qpid/broker/QueueFactory.h b/qpid/cpp/src/qpid/broker/QueueFactory.h
index 585983ba25..585983ba25 100644
--- a/cpp/src/qpid/broker/QueueFactory.h
+++ b/qpid/cpp/src/qpid/broker/QueueFactory.h
diff --git a/cpp/src/qpid/broker/QueueFlowLimit.cpp b/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
index 9c215d197f..9c215d197f 100644
--- a/cpp/src/qpid/broker/QueueFlowLimit.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
diff --git a/cpp/src/qpid/broker/QueueFlowLimit.h b/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
index 92bd7f76a0..92bd7f76a0 100644
--- a/cpp/src/qpid/broker/QueueFlowLimit.h
+++ b/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
diff --git a/cpp/src/qpid/broker/QueueListeners.cpp b/qpid/cpp/src/qpid/broker/QueueListeners.cpp
index 0338a674cf..0338a674cf 100644
--- a/cpp/src/qpid/broker/QueueListeners.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueListeners.cpp
diff --git a/cpp/src/qpid/broker/QueueListeners.h b/qpid/cpp/src/qpid/broker/QueueListeners.h
index ca844fd47e..ca844fd47e 100644
--- a/cpp/src/qpid/broker/QueueListeners.h
+++ b/qpid/cpp/src/qpid/broker/QueueListeners.h
diff --git a/cpp/src/qpid/broker/QueueObserver.h b/qpid/cpp/src/qpid/broker/QueueObserver.h
index 6d29f83721..6d29f83721 100644
--- a/cpp/src/qpid/broker/QueueObserver.h
+++ b/qpid/cpp/src/qpid/broker/QueueObserver.h
diff --git a/cpp/src/qpid/broker/QueueObservers.h b/qpid/cpp/src/qpid/broker/QueueObservers.h
index 1bf5f1f696..1bf5f1f696 100644
--- a/cpp/src/qpid/broker/QueueObservers.h
+++ b/qpid/cpp/src/qpid/broker/QueueObservers.h
diff --git a/cpp/src/qpid/broker/QueueRegistry.cpp b/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
index 1283a42e6d..1283a42e6d 100644
--- a/cpp/src/qpid/broker/QueueRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
diff --git a/cpp/src/qpid/broker/QueueRegistry.h b/qpid/cpp/src/qpid/broker/QueueRegistry.h
index af4e8e50fb..af4e8e50fb 100644
--- a/cpp/src/qpid/broker/QueueRegistry.h
+++ b/qpid/cpp/src/qpid/broker/QueueRegistry.h
diff --git a/cpp/src/qpid/broker/QueueSettings.cpp b/qpid/cpp/src/qpid/broker/QueueSettings.cpp
index 8de8539579..8de8539579 100644
--- a/cpp/src/qpid/broker/QueueSettings.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueSettings.cpp
diff --git a/cpp/src/qpid/broker/QueueSettings.h b/qpid/cpp/src/qpid/broker/QueueSettings.h
index 9fda51e17a..9fda51e17a 100644
--- a/cpp/src/qpid/broker/QueueSettings.h
+++ b/qpid/cpp/src/qpid/broker/QueueSettings.h
diff --git a/cpp/src/qpid/broker/QueuedMessage.cpp b/qpid/cpp/src/qpid/broker/QueuedMessage.cpp
index d40cc901ff..d40cc901ff 100644
--- a/cpp/src/qpid/broker/QueuedMessage.cpp
+++ b/qpid/cpp/src/qpid/broker/QueuedMessage.cpp
diff --git a/cpp/src/qpid/broker/QueuedMessage.h b/qpid/cpp/src/qpid/broker/QueuedMessage.h
index c80fff900a..c80fff900a 100644
--- a/cpp/src/qpid/broker/QueuedMessage.h
+++ b/qpid/cpp/src/qpid/broker/QueuedMessage.h
diff --git a/cpp/src/qpid/broker/RecoverableConfig.h b/qpid/cpp/src/qpid/broker/RecoverableConfig.h
index 838a8582dc..838a8582dc 100644
--- a/cpp/src/qpid/broker/RecoverableConfig.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableConfig.h
diff --git a/cpp/src/qpid/broker/RecoverableExchange.h b/qpid/cpp/src/qpid/broker/RecoverableExchange.h
index f8c08b2989..f8c08b2989 100644
--- a/cpp/src/qpid/broker/RecoverableExchange.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableExchange.h
diff --git a/cpp/src/qpid/broker/RecoverableMessage.h b/qpid/cpp/src/qpid/broker/RecoverableMessage.h
index 3c82a69883..3c82a69883 100644
--- a/cpp/src/qpid/broker/RecoverableMessage.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableMessage.h
diff --git a/cpp/src/qpid/broker/RecoverableMessageImpl.h b/qpid/cpp/src/qpid/broker/RecoverableMessageImpl.h
index c257c2057b..c257c2057b 100644
--- a/cpp/src/qpid/broker/RecoverableMessageImpl.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableMessageImpl.h
diff --git a/cpp/src/qpid/broker/RecoverableQueue.h b/qpid/cpp/src/qpid/broker/RecoverableQueue.h
index ab300dbce9..ab300dbce9 100644
--- a/cpp/src/qpid/broker/RecoverableQueue.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableQueue.h
diff --git a/cpp/src/qpid/broker/RecoverableTransaction.h b/qpid/cpp/src/qpid/broker/RecoverableTransaction.h
index 1b7d94bd1a..1b7d94bd1a 100644
--- a/cpp/src/qpid/broker/RecoverableTransaction.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableTransaction.h
diff --git a/cpp/src/qpid/broker/RecoveredDequeue.cpp b/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
index 6e21a5bc21..6e21a5bc21 100644
--- a/cpp/src/qpid/broker/RecoveredDequeue.cpp
+++ b/qpid/cpp/src/qpid/broker/RecoveredDequeue.cpp
diff --git a/cpp/src/qpid/broker/RecoveredDequeue.h b/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
index b85919975c..b85919975c 100644
--- a/cpp/src/qpid/broker/RecoveredDequeue.h
+++ b/qpid/cpp/src/qpid/broker/RecoveredDequeue.h
diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.cpp b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
index 296d5194c0..296d5194c0 100644
--- a/cpp/src/qpid/broker/RecoveredEnqueue.cpp
+++ b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.cpp
diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.h b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
index 01c350af92..01c350af92 100644
--- a/cpp/src/qpid/broker/RecoveredEnqueue.h
+++ b/qpid/cpp/src/qpid/broker/RecoveredEnqueue.h
diff --git a/cpp/src/qpid/broker/RecoveryManager.h b/qpid/cpp/src/qpid/broker/RecoveryManager.h
index 2929e92250..2929e92250 100644
--- a/cpp/src/qpid/broker/RecoveryManager.h
+++ b/qpid/cpp/src/qpid/broker/RecoveryManager.h
diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
index dd9bfc57f6..dd9bfc57f6 100644
--- a/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
+++ b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
diff --git a/cpp/src/qpid/broker/RecoveryManagerImpl.h b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.h
index 22ea6f8d04..22ea6f8d04 100644
--- a/cpp/src/qpid/broker/RecoveryManagerImpl.h
+++ b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.h
diff --git a/cpp/src/qpid/broker/RetryList.cpp b/qpid/cpp/src/qpid/broker/RetryList.cpp
index b0477dd0f7..b0477dd0f7 100644
--- a/cpp/src/qpid/broker/RetryList.cpp
+++ b/qpid/cpp/src/qpid/broker/RetryList.cpp
diff --git a/cpp/src/qpid/broker/RetryList.h b/qpid/cpp/src/qpid/broker/RetryList.h
index 9c4b779bcb..9c4b779bcb 100644
--- a/cpp/src/qpid/broker/RetryList.h
+++ b/qpid/cpp/src/qpid/broker/RetryList.h
diff --git a/cpp/src/qpid/broker/SaslAuthenticator.cpp b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
index d5ada6f3a5..d5ada6f3a5 100644
--- a/cpp/src/qpid/broker/SaslAuthenticator.cpp
+++ b/qpid/cpp/src/qpid/broker/SaslAuthenticator.cpp
diff --git a/cpp/src/qpid/broker/SaslAuthenticator.h b/qpid/cpp/src/qpid/broker/SaslAuthenticator.h
index 97434d6ffe..97434d6ffe 100644
--- a/cpp/src/qpid/broker/SaslAuthenticator.h
+++ b/qpid/cpp/src/qpid/broker/SaslAuthenticator.h
diff --git a/cpp/src/qpid/broker/SecureConnection.cpp b/qpid/cpp/src/qpid/broker/SecureConnection.cpp
index 59ac9ef132..59ac9ef132 100644
--- a/cpp/src/qpid/broker/SecureConnection.cpp
+++ b/qpid/cpp/src/qpid/broker/SecureConnection.cpp
diff --git a/cpp/src/qpid/broker/SecureConnection.h b/qpid/cpp/src/qpid/broker/SecureConnection.h
index 632087350e..632087350e 100644
--- a/cpp/src/qpid/broker/SecureConnection.h
+++ b/qpid/cpp/src/qpid/broker/SecureConnection.h
diff --git a/cpp/src/qpid/broker/Selector.cpp b/qpid/cpp/src/qpid/broker/Selector.cpp
index 21247e125c..21247e125c 100644
--- a/cpp/src/qpid/broker/Selector.cpp
+++ b/qpid/cpp/src/qpid/broker/Selector.cpp
diff --git a/cpp/src/qpid/broker/Selector.h b/qpid/cpp/src/qpid/broker/Selector.h
index 0e151ecd0e..0e151ecd0e 100644
--- a/cpp/src/qpid/broker/Selector.h
+++ b/qpid/cpp/src/qpid/broker/Selector.h
diff --git a/cpp/src/qpid/broker/SelectorExpression.cpp b/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
index 1e8a90ed4c..1e8a90ed4c 100644
--- a/cpp/src/qpid/broker/SelectorExpression.cpp
+++ b/qpid/cpp/src/qpid/broker/SelectorExpression.cpp
diff --git a/cpp/src/qpid/broker/SelectorExpression.h b/qpid/cpp/src/qpid/broker/SelectorExpression.h
index 158f086287..158f086287 100644
--- a/cpp/src/qpid/broker/SelectorExpression.h
+++ b/qpid/cpp/src/qpid/broker/SelectorExpression.h
diff --git a/cpp/src/qpid/broker/SelectorToken.cpp b/qpid/cpp/src/qpid/broker/SelectorToken.cpp
index d69267b2e5..d69267b2e5 100644
--- a/cpp/src/qpid/broker/SelectorToken.cpp
+++ b/qpid/cpp/src/qpid/broker/SelectorToken.cpp
diff --git a/cpp/src/qpid/broker/SelectorToken.h b/qpid/cpp/src/qpid/broker/SelectorToken.h
index bd60b69dce..bd60b69dce 100644
--- a/cpp/src/qpid/broker/SelectorToken.h
+++ b/qpid/cpp/src/qpid/broker/SelectorToken.h
diff --git a/cpp/src/qpid/broker/SelectorValue.cpp b/qpid/cpp/src/qpid/broker/SelectorValue.cpp
index 0855fa91d0..0855fa91d0 100644
--- a/cpp/src/qpid/broker/SelectorValue.cpp
+++ b/qpid/cpp/src/qpid/broker/SelectorValue.cpp
diff --git a/cpp/src/qpid/broker/SelectorValue.h b/qpid/cpp/src/qpid/broker/SelectorValue.h
index 3a731fd000..3a731fd000 100644
--- a/cpp/src/qpid/broker/SelectorValue.h
+++ b/qpid/cpp/src/qpid/broker/SelectorValue.h
diff --git a/cpp/src/qpid/broker/SelfDestructQueue.cpp b/qpid/cpp/src/qpid/broker/SelfDestructQueue.cpp
index f8b26a62ad..f8b26a62ad 100644
--- a/cpp/src/qpid/broker/SelfDestructQueue.cpp
+++ b/qpid/cpp/src/qpid/broker/SelfDestructQueue.cpp
diff --git a/cpp/src/qpid/broker/SelfDestructQueue.h b/qpid/cpp/src/qpid/broker/SelfDestructQueue.h
index 110eb1dcf7..110eb1dcf7 100644
--- a/cpp/src/qpid/broker/SelfDestructQueue.h
+++ b/qpid/cpp/src/qpid/broker/SelfDestructQueue.h
diff --git a/cpp/src/qpid/broker/SemanticState.cpp b/qpid/cpp/src/qpid/broker/SemanticState.cpp
index 1b3823c845..1b3823c845 100644
--- a/cpp/src/qpid/broker/SemanticState.cpp
+++ b/qpid/cpp/src/qpid/broker/SemanticState.cpp
diff --git a/cpp/src/qpid/broker/SemanticState.h b/qpid/cpp/src/qpid/broker/SemanticState.h
index e5456067a8..e5456067a8 100644
--- a/cpp/src/qpid/broker/SemanticState.h
+++ b/qpid/cpp/src/qpid/broker/SemanticState.h
diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
index c4a0d9f008..c4a0d9f008 100644
--- a/cpp/src/qpid/broker/SessionAdapter.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionAdapter.cpp
diff --git a/cpp/src/qpid/broker/SessionAdapter.h b/qpid/cpp/src/qpid/broker/SessionAdapter.h
index 6c09d68254..6c09d68254 100644
--- a/cpp/src/qpid/broker/SessionAdapter.h
+++ b/qpid/cpp/src/qpid/broker/SessionAdapter.h
diff --git a/cpp/src/qpid/broker/SessionContext.h b/qpid/cpp/src/qpid/broker/SessionContext.h
index 53f3e1bab3..53f3e1bab3 100644
--- a/cpp/src/qpid/broker/SessionContext.h
+++ b/qpid/cpp/src/qpid/broker/SessionContext.h
diff --git a/cpp/src/qpid/broker/SessionHandler.cpp b/qpid/cpp/src/qpid/broker/SessionHandler.cpp
index 3d5faf2dab..3d5faf2dab 100644
--- a/cpp/src/qpid/broker/SessionHandler.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionHandler.cpp
diff --git a/cpp/src/qpid/broker/SessionHandler.h b/qpid/cpp/src/qpid/broker/SessionHandler.h
index ee6baed0b6..ee6baed0b6 100644
--- a/cpp/src/qpid/broker/SessionHandler.h
+++ b/qpid/cpp/src/qpid/broker/SessionHandler.h
diff --git a/cpp/src/qpid/broker/SessionHandlerObserver.h b/qpid/cpp/src/qpid/broker/SessionHandlerObserver.h
index 6d0ea16254..6d0ea16254 100644
--- a/cpp/src/qpid/broker/SessionHandlerObserver.h
+++ b/qpid/cpp/src/qpid/broker/SessionHandlerObserver.h
diff --git a/cpp/src/qpid/broker/SessionManager.cpp b/qpid/cpp/src/qpid/broker/SessionManager.cpp
index a39cbab88a..a39cbab88a 100644
--- a/cpp/src/qpid/broker/SessionManager.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionManager.cpp
diff --git a/cpp/src/qpid/broker/SessionManager.h b/qpid/cpp/src/qpid/broker/SessionManager.h
index db88e7ec10..db88e7ec10 100644
--- a/cpp/src/qpid/broker/SessionManager.h
+++ b/qpid/cpp/src/qpid/broker/SessionManager.h
diff --git a/cpp/src/qpid/broker/SessionOutputException.h b/qpid/cpp/src/qpid/broker/SessionOutputException.h
index 7c1c5de926..7c1c5de926 100644
--- a/cpp/src/qpid/broker/SessionOutputException.h
+++ b/qpid/cpp/src/qpid/broker/SessionOutputException.h
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/qpid/cpp/src/qpid/broker/SessionState.cpp
index 6836794622..6836794622 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionState.cpp
diff --git a/cpp/src/qpid/broker/SessionState.h b/qpid/cpp/src/qpid/broker/SessionState.h
index c71c520f9c..c71c520f9c 100644
--- a/cpp/src/qpid/broker/SessionState.h
+++ b/qpid/cpp/src/qpid/broker/SessionState.h
diff --git a/cpp/src/qpid/broker/SignalHandler.cpp b/qpid/cpp/src/qpid/broker/SignalHandler.cpp
index 16c141f21c..16c141f21c 100644
--- a/cpp/src/qpid/broker/SignalHandler.cpp
+++ b/qpid/cpp/src/qpid/broker/SignalHandler.cpp
diff --git a/cpp/src/qpid/broker/SignalHandler.h b/qpid/cpp/src/qpid/broker/SignalHandler.h
index 7bfa9ea630..7bfa9ea630 100644
--- a/cpp/src/qpid/broker/SignalHandler.h
+++ b/qpid/cpp/src/qpid/broker/SignalHandler.h
diff --git a/cpp/src/qpid/broker/System.cpp b/qpid/cpp/src/qpid/broker/System.cpp
index f3535b0eec..f3535b0eec 100644
--- a/cpp/src/qpid/broker/System.cpp
+++ b/qpid/cpp/src/qpid/broker/System.cpp
diff --git a/cpp/src/qpid/broker/System.h b/qpid/cpp/src/qpid/broker/System.h
index 4a4af275c4..4a4af275c4 100644
--- a/cpp/src/qpid/broker/System.h
+++ b/qpid/cpp/src/qpid/broker/System.h
diff --git a/cpp/src/qpid/broker/ThresholdAlerts.cpp b/qpid/cpp/src/qpid/broker/ThresholdAlerts.cpp
index 41d20342c8..41d20342c8 100644
--- a/cpp/src/qpid/broker/ThresholdAlerts.cpp
+++ b/qpid/cpp/src/qpid/broker/ThresholdAlerts.cpp
diff --git a/cpp/src/qpid/broker/ThresholdAlerts.h b/qpid/cpp/src/qpid/broker/ThresholdAlerts.h
index a8ff5270f3..a8ff5270f3 100644
--- a/cpp/src/qpid/broker/ThresholdAlerts.h
+++ b/qpid/cpp/src/qpid/broker/ThresholdAlerts.h
diff --git a/cpp/src/qpid/broker/TopicExchange.cpp b/qpid/cpp/src/qpid/broker/TopicExchange.cpp
index 558c900a4f..558c900a4f 100644
--- a/cpp/src/qpid/broker/TopicExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.cpp
diff --git a/cpp/src/qpid/broker/TopicExchange.h b/qpid/cpp/src/qpid/broker/TopicExchange.h
index d54f23a70d..d54f23a70d 100644
--- a/cpp/src/qpid/broker/TopicExchange.h
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.h
diff --git a/cpp/src/qpid/broker/TopicKeyNode.h b/qpid/cpp/src/qpid/broker/TopicKeyNode.h
index ac760b198e..ac760b198e 100644
--- a/cpp/src/qpid/broker/TopicKeyNode.h
+++ b/qpid/cpp/src/qpid/broker/TopicKeyNode.h
diff --git a/cpp/src/qpid/broker/TransactionObserver.h b/qpid/cpp/src/qpid/broker/TransactionObserver.h
index 5333d7b8d6..5333d7b8d6 100644
--- a/cpp/src/qpid/broker/TransactionObserver.h
+++ b/qpid/cpp/src/qpid/broker/TransactionObserver.h
diff --git a/cpp/src/qpid/broker/TransactionalStore.h b/qpid/cpp/src/qpid/broker/TransactionalStore.h
index 2a2bac0c51..2a2bac0c51 100644
--- a/cpp/src/qpid/broker/TransactionalStore.h
+++ b/qpid/cpp/src/qpid/broker/TransactionalStore.h
diff --git a/cpp/src/qpid/broker/TxAccept.cpp b/qpid/cpp/src/qpid/broker/TxAccept.cpp
index 496f8a2a42..496f8a2a42 100644
--- a/cpp/src/qpid/broker/TxAccept.cpp
+++ b/qpid/cpp/src/qpid/broker/TxAccept.cpp
diff --git a/cpp/src/qpid/broker/TxAccept.h b/qpid/cpp/src/qpid/broker/TxAccept.h
index 97e82ffa3f..97e82ffa3f 100644
--- a/cpp/src/qpid/broker/TxAccept.h
+++ b/qpid/cpp/src/qpid/broker/TxAccept.h
diff --git a/cpp/src/qpid/broker/TxBuffer.cpp b/qpid/cpp/src/qpid/broker/TxBuffer.cpp
index f7552f16a3..f7552f16a3 100644
--- a/cpp/src/qpid/broker/TxBuffer.cpp
+++ b/qpid/cpp/src/qpid/broker/TxBuffer.cpp
diff --git a/cpp/src/qpid/broker/TxBuffer.h b/qpid/cpp/src/qpid/broker/TxBuffer.h
index 2478b78138..2478b78138 100644
--- a/cpp/src/qpid/broker/TxBuffer.h
+++ b/qpid/cpp/src/qpid/broker/TxBuffer.h
diff --git a/cpp/src/qpid/broker/TxDequeue.cpp b/qpid/cpp/src/qpid/broker/TxDequeue.cpp
index e9a2e0ca98..e9a2e0ca98 100644
--- a/cpp/src/qpid/broker/TxDequeue.cpp
+++ b/qpid/cpp/src/qpid/broker/TxDequeue.cpp
diff --git a/cpp/src/qpid/broker/TxDequeue.h b/qpid/cpp/src/qpid/broker/TxDequeue.h
index e861bcaa77..e861bcaa77 100644
--- a/cpp/src/qpid/broker/TxDequeue.h
+++ b/qpid/cpp/src/qpid/broker/TxDequeue.h
diff --git a/cpp/src/qpid/broker/TxOp.h b/qpid/cpp/src/qpid/broker/TxOp.h
index 00303eb27c..00303eb27c 100644
--- a/cpp/src/qpid/broker/TxOp.h
+++ b/qpid/cpp/src/qpid/broker/TxOp.h
diff --git a/cpp/src/qpid/broker/Vhost.cpp b/qpid/cpp/src/qpid/broker/Vhost.cpp
index 8fd88601f5..8fd88601f5 100644
--- a/cpp/src/qpid/broker/Vhost.cpp
+++ b/qpid/cpp/src/qpid/broker/Vhost.cpp
diff --git a/cpp/src/qpid/broker/Vhost.h b/qpid/cpp/src/qpid/broker/Vhost.h
index 06a11db8ea..06a11db8ea 100644
--- a/cpp/src/qpid/broker/Vhost.h
+++ b/qpid/cpp/src/qpid/broker/Vhost.h
diff --git a/cpp/src/qpid/broker/amqp/Authorise.cpp b/qpid/cpp/src/qpid/broker/amqp/Authorise.cpp
index 3c88414567..3c88414567 100644
--- a/cpp/src/qpid/broker/amqp/Authorise.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Authorise.cpp
diff --git a/cpp/src/qpid/broker/amqp/Authorise.h b/qpid/cpp/src/qpid/broker/amqp/Authorise.h
index 3714511177..3714511177 100644
--- a/cpp/src/qpid/broker/amqp/Authorise.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Authorise.h
diff --git a/cpp/src/qpid/broker/amqp/BrokerContext.cpp b/qpid/cpp/src/qpid/broker/amqp/BrokerContext.cpp
index 9f7ae17293..9f7ae17293 100644
--- a/cpp/src/qpid/broker/amqp/BrokerContext.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/BrokerContext.cpp
diff --git a/cpp/src/qpid/broker/amqp/BrokerContext.h b/qpid/cpp/src/qpid/broker/amqp/BrokerContext.h
index feb35e39c4..feb35e39c4 100644
--- a/cpp/src/qpid/broker/amqp/BrokerContext.h
+++ b/qpid/cpp/src/qpid/broker/amqp/BrokerContext.h
diff --git a/cpp/src/qpid/broker/amqp/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
index b4dab83594..b4dab83594 100644
--- a/cpp/src/qpid/broker/amqp/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Connection.cpp
diff --git a/cpp/src/qpid/broker/amqp/Connection.h b/qpid/cpp/src/qpid/broker/amqp/Connection.h
index 0d06f18924..0d06f18924 100644
--- a/cpp/src/qpid/broker/amqp/Connection.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Connection.h
diff --git a/cpp/src/qpid/broker/amqp/DataReader.cpp b/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp
index ca3e6daabd..ca3e6daabd 100644
--- a/cpp/src/qpid/broker/amqp/DataReader.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/DataReader.cpp
diff --git a/cpp/src/qpid/broker/amqp/DataReader.h b/qpid/cpp/src/qpid/broker/amqp/DataReader.h
index 99ff77b3dd..99ff77b3dd 100644
--- a/cpp/src/qpid/broker/amqp/DataReader.h
+++ b/qpid/cpp/src/qpid/broker/amqp/DataReader.h
diff --git a/cpp/src/qpid/broker/amqp/Domain.cpp b/qpid/cpp/src/qpid/broker/amqp/Domain.cpp
index c2d4782fc4..c2d4782fc4 100644
--- a/cpp/src/qpid/broker/amqp/Domain.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Domain.cpp
diff --git a/cpp/src/qpid/broker/amqp/Domain.h b/qpid/cpp/src/qpid/broker/amqp/Domain.h
index 7ee8572c8a..7ee8572c8a 100644
--- a/cpp/src/qpid/broker/amqp/Domain.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Domain.h
diff --git a/cpp/src/qpid/broker/amqp/Exception.cpp b/qpid/cpp/src/qpid/broker/amqp/Exception.cpp
index 6b874aa272..6b874aa272 100644
--- a/cpp/src/qpid/broker/amqp/Exception.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Exception.cpp
diff --git a/cpp/src/qpid/broker/amqp/Exception.h b/qpid/cpp/src/qpid/broker/amqp/Exception.h
index a129dffe1f..a129dffe1f 100644
--- a/cpp/src/qpid/broker/amqp/Exception.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Exception.h
diff --git a/cpp/src/qpid/broker/amqp/Filter.cpp b/qpid/cpp/src/qpid/broker/amqp/Filter.cpp
index b7b29e004d..b7b29e004d 100644
--- a/cpp/src/qpid/broker/amqp/Filter.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Filter.cpp
diff --git a/cpp/src/qpid/broker/amqp/Filter.h b/qpid/cpp/src/qpid/broker/amqp/Filter.h
index c246fb9ede..c246fb9ede 100644
--- a/cpp/src/qpid/broker/amqp/Filter.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Filter.h
diff --git a/cpp/src/qpid/broker/amqp/Header.cpp b/qpid/cpp/src/qpid/broker/amqp/Header.cpp
index e1b3d22553..e1b3d22553 100644
--- a/cpp/src/qpid/broker/amqp/Header.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Header.cpp
diff --git a/cpp/src/qpid/broker/amqp/Header.h b/qpid/cpp/src/qpid/broker/amqp/Header.h
index 6e4f763028..6e4f763028 100644
--- a/cpp/src/qpid/broker/amqp/Header.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Header.h
diff --git a/cpp/src/qpid/broker/amqp/Incoming.cpp b/qpid/cpp/src/qpid/broker/amqp/Incoming.cpp
index 3986818846..3986818846 100644
--- a/cpp/src/qpid/broker/amqp/Incoming.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Incoming.cpp
diff --git a/cpp/src/qpid/broker/amqp/Incoming.h b/qpid/cpp/src/qpid/broker/amqp/Incoming.h
index ccf999a256..ccf999a256 100644
--- a/cpp/src/qpid/broker/amqp/Incoming.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Incoming.h
diff --git a/cpp/src/qpid/broker/amqp/Interconnect.cpp b/qpid/cpp/src/qpid/broker/amqp/Interconnect.cpp
index 41d22d39cc..41d22d39cc 100644
--- a/cpp/src/qpid/broker/amqp/Interconnect.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Interconnect.cpp
diff --git a/cpp/src/qpid/broker/amqp/Interconnect.h b/qpid/cpp/src/qpid/broker/amqp/Interconnect.h
index d8eb457be2..d8eb457be2 100644
--- a/cpp/src/qpid/broker/amqp/Interconnect.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Interconnect.h
diff --git a/cpp/src/qpid/broker/amqp/Interconnects.cpp b/qpid/cpp/src/qpid/broker/amqp/Interconnects.cpp
index 912b244bf9..912b244bf9 100644
--- a/cpp/src/qpid/broker/amqp/Interconnects.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Interconnects.cpp
diff --git a/cpp/src/qpid/broker/amqp/Interconnects.h b/qpid/cpp/src/qpid/broker/amqp/Interconnects.h
index 030d6d6446..030d6d6446 100644
--- a/cpp/src/qpid/broker/amqp/Interconnects.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Interconnects.h
diff --git a/cpp/src/qpid/broker/amqp/ManagedConnection.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
index 2c4824bc51..2c4824bc51 100644
--- a/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.cpp
diff --git a/cpp/src/qpid/broker/amqp/ManagedConnection.h b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.h
index 77483b5630..77483b5630 100644
--- a/cpp/src/qpid/broker/amqp/ManagedConnection.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedConnection.h
diff --git a/cpp/src/qpid/broker/amqp/ManagedIncomingLink.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedIncomingLink.cpp
index a30349d50e..a30349d50e 100644
--- a/cpp/src/qpid/broker/amqp/ManagedIncomingLink.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedIncomingLink.cpp
diff --git a/cpp/src/qpid/broker/amqp/ManagedIncomingLink.h b/qpid/cpp/src/qpid/broker/amqp/ManagedIncomingLink.h
index 5d4b1409d4..5d4b1409d4 100644
--- a/cpp/src/qpid/broker/amqp/ManagedIncomingLink.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedIncomingLink.h
diff --git a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
index 9c538f864c..9c538f864c 100644
--- a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.cpp
diff --git a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
index f6415bff38..f6415bff38 100644
--- a/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedOutgoingLink.h
diff --git a/cpp/src/qpid/broker/amqp/ManagedSession.cpp b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
index 3bf9cf90db..3bf9cf90db 100644
--- a/cpp/src/qpid/broker/amqp/ManagedSession.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.cpp
diff --git a/cpp/src/qpid/broker/amqp/ManagedSession.h b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.h
index c35e304cfb..c35e304cfb 100644
--- a/cpp/src/qpid/broker/amqp/ManagedSession.h
+++ b/qpid/cpp/src/qpid/broker/amqp/ManagedSession.h
diff --git a/cpp/src/qpid/broker/amqp/Message.cpp b/qpid/cpp/src/qpid/broker/amqp/Message.cpp
index 54741e6436..54741e6436 100644
--- a/cpp/src/qpid/broker/amqp/Message.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Message.cpp
diff --git a/cpp/src/qpid/broker/amqp/Message.h b/qpid/cpp/src/qpid/broker/amqp/Message.h
index 20310aa977..20310aa977 100644
--- a/cpp/src/qpid/broker/amqp/Message.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Message.h
diff --git a/cpp/src/qpid/broker/amqp/NodePolicy.cpp b/qpid/cpp/src/qpid/broker/amqp/NodePolicy.cpp
index 69b41dafa2..69b41dafa2 100644
--- a/cpp/src/qpid/broker/amqp/NodePolicy.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/NodePolicy.cpp
diff --git a/cpp/src/qpid/broker/amqp/NodePolicy.h b/qpid/cpp/src/qpid/broker/amqp/NodePolicy.h
index d6e987d85f..d6e987d85f 100644
--- a/cpp/src/qpid/broker/amqp/NodePolicy.h
+++ b/qpid/cpp/src/qpid/broker/amqp/NodePolicy.h
diff --git a/cpp/src/qpid/broker/amqp/NodeProperties.cpp b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
index 500a0c042d..500a0c042d 100644
--- a/cpp/src/qpid/broker/amqp/NodeProperties.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.cpp
diff --git a/cpp/src/qpid/broker/amqp/NodeProperties.h b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h
index 45a3533cf4..45a3533cf4 100644
--- a/cpp/src/qpid/broker/amqp/NodeProperties.h
+++ b/qpid/cpp/src/qpid/broker/amqp/NodeProperties.h
diff --git a/cpp/src/qpid/broker/amqp/Outgoing.cpp b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
index f2949c5879..f2949c5879 100644
--- a/cpp/src/qpid/broker/amqp/Outgoing.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.cpp
diff --git a/cpp/src/qpid/broker/amqp/Outgoing.h b/qpid/cpp/src/qpid/broker/amqp/Outgoing.h
index d3825d0894..d3825d0894 100644
--- a/cpp/src/qpid/broker/amqp/Outgoing.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Outgoing.h
diff --git a/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp b/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
index abc26876b5..abc26876b5 100644
--- a/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/ProtocolPlugin.cpp
diff --git a/cpp/src/qpid/broker/amqp/Relay.cpp b/qpid/cpp/src/qpid/broker/amqp/Relay.cpp
index 587a11466a..587a11466a 100644
--- a/cpp/src/qpid/broker/amqp/Relay.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Relay.cpp
diff --git a/cpp/src/qpid/broker/amqp/Relay.h b/qpid/cpp/src/qpid/broker/amqp/Relay.h
index 32f317bfe1..32f317bfe1 100644
--- a/cpp/src/qpid/broker/amqp/Relay.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Relay.h
diff --git a/cpp/src/qpid/broker/amqp/Sasl.cpp b/qpid/cpp/src/qpid/broker/amqp/Sasl.cpp
index 907e04f5ed..907e04f5ed 100644
--- a/cpp/src/qpid/broker/amqp/Sasl.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Sasl.cpp
diff --git a/cpp/src/qpid/broker/amqp/Sasl.h b/qpid/cpp/src/qpid/broker/amqp/Sasl.h
index 859cfb2d34..859cfb2d34 100644
--- a/cpp/src/qpid/broker/amqp/Sasl.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Sasl.h
diff --git a/cpp/src/qpid/broker/amqp/SaslClient.cpp b/qpid/cpp/src/qpid/broker/amqp/SaslClient.cpp
index 4317d18525..4317d18525 100644
--- a/cpp/src/qpid/broker/amqp/SaslClient.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/SaslClient.cpp
diff --git a/cpp/src/qpid/broker/amqp/SaslClient.h b/qpid/cpp/src/qpid/broker/amqp/SaslClient.h
index fca293879e..fca293879e 100644
--- a/cpp/src/qpid/broker/amqp/SaslClient.h
+++ b/qpid/cpp/src/qpid/broker/amqp/SaslClient.h
diff --git a/cpp/src/qpid/broker/amqp/Session.cpp b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
index aa4ba03dfd..aa4ba03dfd 100644
--- a/cpp/src/qpid/broker/amqp/Session.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Session.cpp
diff --git a/cpp/src/qpid/broker/amqp/Session.h b/qpid/cpp/src/qpid/broker/amqp/Session.h
index 2537d6ca27..2537d6ca27 100644
--- a/cpp/src/qpid/broker/amqp/Session.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Session.h
diff --git a/cpp/src/qpid/broker/amqp/Topic.cpp b/qpid/cpp/src/qpid/broker/amqp/Topic.cpp
index 93f4b83f08..93f4b83f08 100644
--- a/cpp/src/qpid/broker/amqp/Topic.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Topic.cpp
diff --git a/cpp/src/qpid/broker/amqp/Topic.h b/qpid/cpp/src/qpid/broker/amqp/Topic.h
index 457b8cfced..457b8cfced 100644
--- a/cpp/src/qpid/broker/amqp/Topic.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Topic.h
diff --git a/cpp/src/qpid/broker/amqp/Translation.cpp b/qpid/cpp/src/qpid/broker/amqp/Translation.cpp
index 2196c8ff3d..2196c8ff3d 100644
--- a/cpp/src/qpid/broker/amqp/Translation.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp/Translation.cpp
diff --git a/cpp/src/qpid/broker/amqp/Translation.h b/qpid/cpp/src/qpid/broker/amqp/Translation.h
index 47cb69d0ba..47cb69d0ba 100644
--- a/cpp/src/qpid/broker/amqp/Translation.h
+++ b/qpid/cpp/src/qpid/broker/amqp/Translation.h
diff --git a/cpp/src/qpid/broker/amqp_0_10/Connection.cpp b/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.cpp
index 518c2fa9d0..518c2fa9d0 100644
--- a/cpp/src/qpid/broker/amqp_0_10/Connection.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.cpp
diff --git a/cpp/src/qpid/broker/amqp_0_10/Connection.h b/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.h
index 1bf6b2cee3..1bf6b2cee3 100644
--- a/cpp/src/qpid/broker/amqp_0_10/Connection.h
+++ b/qpid/cpp/src/qpid/broker/amqp_0_10/Connection.h
diff --git a/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.cpp b/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.cpp
index a43bf8efa6..a43bf8efa6 100644
--- a/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.cpp
+++ b/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.cpp
diff --git a/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.h b/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.h
index 513bbe1bfb..513bbe1bfb 100644
--- a/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.h
+++ b/qpid/cpp/src/qpid/broker/amqp_0_10/MessageTransfer.h
diff --git a/cpp/src/qpid/broker/management-schema.xml b/qpid/cpp/src/qpid/broker/management-schema.xml
index debc1a4af2..debc1a4af2 100644
--- a/cpp/src/qpid/broker/management-schema.xml
+++ b/qpid/cpp/src/qpid/broker/management-schema.xml
diff --git a/cpp/src/qpid/broker/posix/BrokerDefaults.cpp b/qpid/cpp/src/qpid/broker/posix/BrokerDefaults.cpp
index e3cfa66b02..e3cfa66b02 100644
--- a/cpp/src/qpid/broker/posix/BrokerDefaults.cpp
+++ b/qpid/cpp/src/qpid/broker/posix/BrokerDefaults.cpp
diff --git a/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp b/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
index d73c5713ea..d73c5713ea 100644
--- a/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
+++ b/qpid/cpp/src/qpid/broker/posix/SocketFDPlugin.cpp
diff --git a/cpp/src/qpid/broker/windows/BrokerDefaults.cpp b/qpid/cpp/src/qpid/broker/windows/BrokerDefaults.cpp
index 6184e0450f..6184e0450f 100644
--- a/cpp/src/qpid/broker/windows/BrokerDefaults.cpp
+++ b/qpid/cpp/src/qpid/broker/windows/BrokerDefaults.cpp
diff --git a/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp b/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
index 19941c7909..19941c7909 100644
--- a/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
+++ b/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp
diff --git a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp b/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
index 6ff624ef75..6ff624ef75 100644
--- a/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
+++ b/qpid/cpp/src/qpid/broker/windows/SslProtocolFactory.cpp
diff --git a/cpp/src/qpid/client/AsyncSession.h b/qpid/cpp/src/qpid/client/AsyncSession.h
index d91efeb4f1..d91efeb4f1 100644
--- a/cpp/src/qpid/client/AsyncSession.h
+++ b/qpid/cpp/src/qpid/client/AsyncSession.h
diff --git a/cpp/src/qpid/client/Bounds.cpp b/qpid/cpp/src/qpid/client/Bounds.cpp
index cc2577d5fc..cc2577d5fc 100644
--- a/cpp/src/qpid/client/Bounds.cpp
+++ b/qpid/cpp/src/qpid/client/Bounds.cpp
diff --git a/cpp/src/qpid/client/Bounds.h b/qpid/cpp/src/qpid/client/Bounds.h
index 838fcb8368..838fcb8368 100644
--- a/cpp/src/qpid/client/Bounds.h
+++ b/qpid/cpp/src/qpid/client/Bounds.h
diff --git a/cpp/src/qpid/client/ChainableFrameHandler.h b/qpid/cpp/src/qpid/client/ChainableFrameHandler.h
index 29e16d53dc..29e16d53dc 100644
--- a/cpp/src/qpid/client/ChainableFrameHandler.h
+++ b/qpid/cpp/src/qpid/client/ChainableFrameHandler.h
diff --git a/cpp/src/qpid/client/ClientImportExport.h b/qpid/cpp/src/qpid/client/ClientImportExport.h
index 2a3a5a52e9..2a3a5a52e9 100644
--- a/cpp/src/qpid/client/ClientImportExport.h
+++ b/qpid/cpp/src/qpid/client/ClientImportExport.h
diff --git a/cpp/src/qpid/client/Completion.cpp b/qpid/cpp/src/qpid/client/Completion.cpp
index fc6737d96f..fc6737d96f 100644
--- a/cpp/src/qpid/client/Completion.cpp
+++ b/qpid/cpp/src/qpid/client/Completion.cpp
diff --git a/cpp/src/qpid/client/Completion.h b/qpid/cpp/src/qpid/client/Completion.h
index 9546db9258..9546db9258 100644
--- a/cpp/src/qpid/client/Completion.h
+++ b/qpid/cpp/src/qpid/client/Completion.h
diff --git a/cpp/src/qpid/client/CompletionImpl.cpp b/qpid/cpp/src/qpid/client/CompletionImpl.cpp
index cf2cfc6138..cf2cfc6138 100644
--- a/cpp/src/qpid/client/CompletionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/CompletionImpl.cpp
diff --git a/cpp/src/qpid/client/CompletionImpl.h b/qpid/cpp/src/qpid/client/CompletionImpl.h
index b8243511ef..b8243511ef 100644
--- a/cpp/src/qpid/client/CompletionImpl.h
+++ b/qpid/cpp/src/qpid/client/CompletionImpl.h
diff --git a/cpp/src/qpid/client/Connection.cpp b/qpid/cpp/src/qpid/client/Connection.cpp
index f7d6341128..f7d6341128 100644
--- a/cpp/src/qpid/client/Connection.cpp
+++ b/qpid/cpp/src/qpid/client/Connection.cpp
diff --git a/cpp/src/qpid/client/Connection.h b/qpid/cpp/src/qpid/client/Connection.h
index 8c8a106c36..8c8a106c36 100644
--- a/cpp/src/qpid/client/Connection.h
+++ b/qpid/cpp/src/qpid/client/Connection.h
diff --git a/cpp/src/qpid/client/ConnectionAccess.h b/qpid/cpp/src/qpid/client/ConnectionAccess.h
index 3a763f692f..3a763f692f 100644
--- a/cpp/src/qpid/client/ConnectionAccess.h
+++ b/qpid/cpp/src/qpid/client/ConnectionAccess.h
diff --git a/cpp/src/qpid/client/ConnectionHandler.cpp b/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
index 77d43f191d..77d43f191d 100644
--- a/cpp/src/qpid/client/ConnectionHandler.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionHandler.cpp
diff --git a/cpp/src/qpid/client/ConnectionHandler.h b/qpid/cpp/src/qpid/client/ConnectionHandler.h
index 6af2e987fb..6af2e987fb 100644
--- a/cpp/src/qpid/client/ConnectionHandler.h
+++ b/qpid/cpp/src/qpid/client/ConnectionHandler.h
diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
index 98d04d8d66..98d04d8d66 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionImpl.cpp
diff --git a/cpp/src/qpid/client/ConnectionImpl.h b/qpid/cpp/src/qpid/client/ConnectionImpl.h
index b07ce142fb..b07ce142fb 100644
--- a/cpp/src/qpid/client/ConnectionImpl.h
+++ b/qpid/cpp/src/qpid/client/ConnectionImpl.h
diff --git a/cpp/src/qpid/client/ConnectionSettings.cpp b/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
index 7d41b48abd..7d41b48abd 100644
--- a/cpp/src/qpid/client/ConnectionSettings.cpp
+++ b/qpid/cpp/src/qpid/client/ConnectionSettings.cpp
diff --git a/cpp/src/qpid/client/ConnectionSettings.h b/qpid/cpp/src/qpid/client/ConnectionSettings.h
index a4b2b59ff7..a4b2b59ff7 100644
--- a/cpp/src/qpid/client/ConnectionSettings.h
+++ b/qpid/cpp/src/qpid/client/ConnectionSettings.h
diff --git a/cpp/src/qpid/client/Connector.cpp b/qpid/cpp/src/qpid/client/Connector.cpp
index afb3c8a597..afb3c8a597 100644
--- a/cpp/src/qpid/client/Connector.cpp
+++ b/qpid/cpp/src/qpid/client/Connector.cpp
diff --git a/cpp/src/qpid/client/Connector.h b/qpid/cpp/src/qpid/client/Connector.h
index 49fb48bdf6..49fb48bdf6 100644
--- a/cpp/src/qpid/client/Connector.h
+++ b/qpid/cpp/src/qpid/client/Connector.h
diff --git a/cpp/src/qpid/client/Demux.cpp b/qpid/cpp/src/qpid/client/Demux.cpp
index abc23c75df..abc23c75df 100644
--- a/cpp/src/qpid/client/Demux.cpp
+++ b/qpid/cpp/src/qpid/client/Demux.cpp
diff --git a/cpp/src/qpid/client/Demux.h b/qpid/cpp/src/qpid/client/Demux.h
index 31dc3f9c06..31dc3f9c06 100644
--- a/cpp/src/qpid/client/Demux.h
+++ b/qpid/cpp/src/qpid/client/Demux.h
diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/qpid/cpp/src/qpid/client/Dispatcher.cpp
index a715c623bf..a715c623bf 100644
--- a/cpp/src/qpid/client/Dispatcher.cpp
+++ b/qpid/cpp/src/qpid/client/Dispatcher.cpp
diff --git a/cpp/src/qpid/client/Dispatcher.h b/qpid/cpp/src/qpid/client/Dispatcher.h
index 74fdb90103..74fdb90103 100644
--- a/cpp/src/qpid/client/Dispatcher.h
+++ b/qpid/cpp/src/qpid/client/Dispatcher.h
diff --git a/cpp/src/qpid/client/Execution.h b/qpid/cpp/src/qpid/client/Execution.h
index ad622af9c1..ad622af9c1 100644
--- a/cpp/src/qpid/client/Execution.h
+++ b/qpid/cpp/src/qpid/client/Execution.h
diff --git a/cpp/src/qpid/client/FailoverListener.cpp b/qpid/cpp/src/qpid/client/FailoverListener.cpp
index 1a69182c90..1a69182c90 100644
--- a/cpp/src/qpid/client/FailoverListener.cpp
+++ b/qpid/cpp/src/qpid/client/FailoverListener.cpp
diff --git a/cpp/src/qpid/client/FailoverListener.h b/qpid/cpp/src/qpid/client/FailoverListener.h
index 53c7c26211..53c7c26211 100644
--- a/cpp/src/qpid/client/FailoverListener.h
+++ b/qpid/cpp/src/qpid/client/FailoverListener.h
diff --git a/cpp/src/qpid/client/FailoverManager.cpp b/qpid/cpp/src/qpid/client/FailoverManager.cpp
index f27aeb5b52..f27aeb5b52 100644
--- a/cpp/src/qpid/client/FailoverManager.cpp
+++ b/qpid/cpp/src/qpid/client/FailoverManager.cpp
diff --git a/cpp/src/qpid/client/FailoverManager.h b/qpid/cpp/src/qpid/client/FailoverManager.h
index bc739fd0f5..bc739fd0f5 100644
--- a/cpp/src/qpid/client/FailoverManager.h
+++ b/qpid/cpp/src/qpid/client/FailoverManager.h
diff --git a/cpp/src/qpid/client/FlowControl.h b/qpid/cpp/src/qpid/client/FlowControl.h
index bff7071b3b..bff7071b3b 100644
--- a/cpp/src/qpid/client/FlowControl.h
+++ b/qpid/cpp/src/qpid/client/FlowControl.h
diff --git a/cpp/src/qpid/client/Future.cpp b/qpid/cpp/src/qpid/client/Future.cpp
index 740cd3df59..740cd3df59 100644
--- a/cpp/src/qpid/client/Future.cpp
+++ b/qpid/cpp/src/qpid/client/Future.cpp
diff --git a/cpp/src/qpid/client/Future.h b/qpid/cpp/src/qpid/client/Future.h
index 630a7e03c0..630a7e03c0 100644
--- a/cpp/src/qpid/client/Future.h
+++ b/qpid/cpp/src/qpid/client/Future.h
diff --git a/cpp/src/qpid/client/FutureCompletion.cpp b/qpid/cpp/src/qpid/client/FutureCompletion.cpp
index ccfb073855..ccfb073855 100644
--- a/cpp/src/qpid/client/FutureCompletion.cpp
+++ b/qpid/cpp/src/qpid/client/FutureCompletion.cpp
diff --git a/cpp/src/qpid/client/FutureCompletion.h b/qpid/cpp/src/qpid/client/FutureCompletion.h
index 0970f494b7..0970f494b7 100644
--- a/cpp/src/qpid/client/FutureCompletion.h
+++ b/qpid/cpp/src/qpid/client/FutureCompletion.h
diff --git a/cpp/src/qpid/client/FutureResult.cpp b/qpid/cpp/src/qpid/client/FutureResult.cpp
index 0237eb1464..0237eb1464 100644
--- a/cpp/src/qpid/client/FutureResult.cpp
+++ b/qpid/cpp/src/qpid/client/FutureResult.cpp
diff --git a/cpp/src/qpid/client/FutureResult.h b/qpid/cpp/src/qpid/client/FutureResult.h
index ead4929571..ead4929571 100644
--- a/cpp/src/qpid/client/FutureResult.h
+++ b/qpid/cpp/src/qpid/client/FutureResult.h
diff --git a/cpp/src/qpid/client/Handle.h b/qpid/cpp/src/qpid/client/Handle.h
index 859dca4029..859dca4029 100644
--- a/cpp/src/qpid/client/Handle.h
+++ b/qpid/cpp/src/qpid/client/Handle.h
diff --git a/cpp/src/qpid/client/LoadPlugins.cpp b/qpid/cpp/src/qpid/client/LoadPlugins.cpp
index 65a43c4012..65a43c4012 100644
--- a/cpp/src/qpid/client/LoadPlugins.cpp
+++ b/qpid/cpp/src/qpid/client/LoadPlugins.cpp
diff --git a/cpp/src/qpid/client/LoadPlugins.h b/qpid/cpp/src/qpid/client/LoadPlugins.h
index 0b398f6831..0b398f6831 100644
--- a/cpp/src/qpid/client/LoadPlugins.h
+++ b/qpid/cpp/src/qpid/client/LoadPlugins.h
diff --git a/cpp/src/qpid/client/LocalQueue.cpp b/qpid/cpp/src/qpid/client/LocalQueue.cpp
index 0019adabaf..0019adabaf 100644
--- a/cpp/src/qpid/client/LocalQueue.cpp
+++ b/qpid/cpp/src/qpid/client/LocalQueue.cpp
diff --git a/cpp/src/qpid/client/LocalQueue.h b/qpid/cpp/src/qpid/client/LocalQueue.h
index 1a19a8499d..1a19a8499d 100644
--- a/cpp/src/qpid/client/LocalQueue.h
+++ b/qpid/cpp/src/qpid/client/LocalQueue.h
diff --git a/cpp/src/qpid/client/LocalQueueImpl.cpp b/qpid/cpp/src/qpid/client/LocalQueueImpl.cpp
index 8b191728f4..8b191728f4 100644
--- a/cpp/src/qpid/client/LocalQueueImpl.cpp
+++ b/qpid/cpp/src/qpid/client/LocalQueueImpl.cpp
diff --git a/cpp/src/qpid/client/LocalQueueImpl.h b/qpid/cpp/src/qpid/client/LocalQueueImpl.h
index 75b62cf203..75b62cf203 100644
--- a/cpp/src/qpid/client/LocalQueueImpl.h
+++ b/qpid/cpp/src/qpid/client/LocalQueueImpl.h
diff --git a/cpp/src/qpid/client/Message.cpp b/qpid/cpp/src/qpid/client/Message.cpp
index 00f911c57e..00f911c57e 100644
--- a/cpp/src/qpid/client/Message.cpp
+++ b/qpid/cpp/src/qpid/client/Message.cpp
diff --git a/cpp/src/qpid/client/Message.h b/qpid/cpp/src/qpid/client/Message.h
index ba50dda9ba..ba50dda9ba 100644
--- a/cpp/src/qpid/client/Message.h
+++ b/qpid/cpp/src/qpid/client/Message.h
diff --git a/cpp/src/qpid/client/MessageImpl.cpp b/qpid/cpp/src/qpid/client/MessageImpl.cpp
index 865c462b15..865c462b15 100644
--- a/cpp/src/qpid/client/MessageImpl.cpp
+++ b/qpid/cpp/src/qpid/client/MessageImpl.cpp
diff --git a/cpp/src/qpid/client/MessageImpl.h b/qpid/cpp/src/qpid/client/MessageImpl.h
index a64ddd20d8..a64ddd20d8 100644
--- a/cpp/src/qpid/client/MessageImpl.h
+++ b/qpid/cpp/src/qpid/client/MessageImpl.h
diff --git a/cpp/src/qpid/client/MessageListener.cpp b/qpid/cpp/src/qpid/client/MessageListener.cpp
index 0f2a71287c..0f2a71287c 100644
--- a/cpp/src/qpid/client/MessageListener.cpp
+++ b/qpid/cpp/src/qpid/client/MessageListener.cpp
diff --git a/cpp/src/qpid/client/MessageListener.h b/qpid/cpp/src/qpid/client/MessageListener.h
index 3ca2fa964a..3ca2fa964a 100644
--- a/cpp/src/qpid/client/MessageListener.h
+++ b/qpid/cpp/src/qpid/client/MessageListener.h
diff --git a/cpp/src/qpid/client/MessageReplayTracker.cpp b/qpid/cpp/src/qpid/client/MessageReplayTracker.cpp
index 3afaae74e8..3afaae74e8 100644
--- a/cpp/src/qpid/client/MessageReplayTracker.cpp
+++ b/qpid/cpp/src/qpid/client/MessageReplayTracker.cpp
diff --git a/cpp/src/qpid/client/MessageReplayTracker.h b/qpid/cpp/src/qpid/client/MessageReplayTracker.h
index 06a3f29c7d..06a3f29c7d 100644
--- a/cpp/src/qpid/client/MessageReplayTracker.h
+++ b/qpid/cpp/src/qpid/client/MessageReplayTracker.h
diff --git a/cpp/src/qpid/client/PrivateImplRef.h b/qpid/cpp/src/qpid/client/PrivateImplRef.h
index fa89b1bfa0..fa89b1bfa0 100644
--- a/cpp/src/qpid/client/PrivateImplRef.h
+++ b/qpid/cpp/src/qpid/client/PrivateImplRef.h
diff --git a/cpp/src/qpid/client/QueueOptions.cpp b/qpid/cpp/src/qpid/client/QueueOptions.cpp
index f7705afeb0..f7705afeb0 100644
--- a/cpp/src/qpid/client/QueueOptions.cpp
+++ b/qpid/cpp/src/qpid/client/QueueOptions.cpp
diff --git a/cpp/src/qpid/client/QueueOptions.h b/qpid/cpp/src/qpid/client/QueueOptions.h
index f7ace15ff9..f7ace15ff9 100644
--- a/cpp/src/qpid/client/QueueOptions.h
+++ b/qpid/cpp/src/qpid/client/QueueOptions.h
diff --git a/cpp/src/qpid/client/RdmaConnector.cpp b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
index 77762343e2..77762343e2 100644
--- a/cpp/src/qpid/client/RdmaConnector.cpp
+++ b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
diff --git a/cpp/src/qpid/client/Results.cpp b/qpid/cpp/src/qpid/client/Results.cpp
index 0de3e8bd04..0de3e8bd04 100644
--- a/cpp/src/qpid/client/Results.cpp
+++ b/qpid/cpp/src/qpid/client/Results.cpp
diff --git a/cpp/src/qpid/client/Results.h b/qpid/cpp/src/qpid/client/Results.h
index 4c49f6b05b..4c49f6b05b 100644
--- a/cpp/src/qpid/client/Results.h
+++ b/qpid/cpp/src/qpid/client/Results.h
diff --git a/cpp/src/qpid/client/Session.h b/qpid/cpp/src/qpid/client/Session.h
index c40549bbc5..c40549bbc5 100644
--- a/cpp/src/qpid/client/Session.h
+++ b/qpid/cpp/src/qpid/client/Session.h
diff --git a/cpp/src/qpid/client/SessionBase_0_10.cpp b/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
index 2de6c601a1..2de6c601a1 100644
--- a/cpp/src/qpid/client/SessionBase_0_10.cpp
+++ b/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
diff --git a/cpp/src/qpid/client/SessionBase_0_10.h b/qpid/cpp/src/qpid/client/SessionBase_0_10.h
index 630987c11d..630987c11d 100644
--- a/cpp/src/qpid/client/SessionBase_0_10.h
+++ b/qpid/cpp/src/qpid/client/SessionBase_0_10.h
diff --git a/cpp/src/qpid/client/SessionBase_0_10Access.h b/qpid/cpp/src/qpid/client/SessionBase_0_10Access.h
index 4d08a7ceaf..4d08a7ceaf 100644
--- a/cpp/src/qpid/client/SessionBase_0_10Access.h
+++ b/qpid/cpp/src/qpid/client/SessionBase_0_10Access.h
diff --git a/cpp/src/qpid/client/SessionImpl.cpp b/qpid/cpp/src/qpid/client/SessionImpl.cpp
index 397067b37a..397067b37a 100644
--- a/cpp/src/qpid/client/SessionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/SessionImpl.cpp
diff --git a/cpp/src/qpid/client/SessionImpl.h b/qpid/cpp/src/qpid/client/SessionImpl.h
index 752d587a39..752d587a39 100644
--- a/cpp/src/qpid/client/SessionImpl.h
+++ b/qpid/cpp/src/qpid/client/SessionImpl.h
diff --git a/cpp/src/qpid/client/SslConnector.cpp b/qpid/cpp/src/qpid/client/SslConnector.cpp
index d5d2433060..d5d2433060 100644
--- a/cpp/src/qpid/client/SslConnector.cpp
+++ b/qpid/cpp/src/qpid/client/SslConnector.cpp
diff --git a/cpp/src/qpid/client/StateManager.cpp b/qpid/cpp/src/qpid/client/StateManager.cpp
index 839d92abdc..839d92abdc 100644
--- a/cpp/src/qpid/client/StateManager.cpp
+++ b/qpid/cpp/src/qpid/client/StateManager.cpp
diff --git a/cpp/src/qpid/client/StateManager.h b/qpid/cpp/src/qpid/client/StateManager.h
index f06dbc493c..f06dbc493c 100644
--- a/cpp/src/qpid/client/StateManager.h
+++ b/qpid/cpp/src/qpid/client/StateManager.h
diff --git a/cpp/src/qpid/client/Subscription.cpp b/qpid/cpp/src/qpid/client/Subscription.cpp
index 988f372604..988f372604 100644
--- a/cpp/src/qpid/client/Subscription.cpp
+++ b/qpid/cpp/src/qpid/client/Subscription.cpp
diff --git a/cpp/src/qpid/client/Subscription.h b/qpid/cpp/src/qpid/client/Subscription.h
index bb9b98e8ff..bb9b98e8ff 100644
--- a/cpp/src/qpid/client/Subscription.h
+++ b/qpid/cpp/src/qpid/client/Subscription.h
diff --git a/cpp/src/qpid/client/SubscriptionImpl.cpp b/qpid/cpp/src/qpid/client/SubscriptionImpl.cpp
index a8a0b47d94..a8a0b47d94 100644
--- a/cpp/src/qpid/client/SubscriptionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/SubscriptionImpl.cpp
diff --git a/cpp/src/qpid/client/SubscriptionImpl.h b/qpid/cpp/src/qpid/client/SubscriptionImpl.h
index da77213423..da77213423 100644
--- a/cpp/src/qpid/client/SubscriptionImpl.h
+++ b/qpid/cpp/src/qpid/client/SubscriptionImpl.h
diff --git a/cpp/src/qpid/client/SubscriptionManager.cpp b/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
index 485361d577..485361d577 100644
--- a/cpp/src/qpid/client/SubscriptionManager.cpp
+++ b/qpid/cpp/src/qpid/client/SubscriptionManager.cpp
diff --git a/cpp/src/qpid/client/SubscriptionManager.h b/qpid/cpp/src/qpid/client/SubscriptionManager.h
index 404a9c6eb9..404a9c6eb9 100644
--- a/cpp/src/qpid/client/SubscriptionManager.h
+++ b/qpid/cpp/src/qpid/client/SubscriptionManager.h
diff --git a/cpp/src/qpid/client/SubscriptionManagerImpl.cpp b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
index 44f81776c0..44f81776c0 100644
--- a/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
+++ b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.cpp
diff --git a/cpp/src/qpid/client/SubscriptionManagerImpl.h b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h
index 64d922e387..64d922e387 100644
--- a/cpp/src/qpid/client/SubscriptionManagerImpl.h
+++ b/qpid/cpp/src/qpid/client/SubscriptionManagerImpl.h
diff --git a/cpp/src/qpid/client/SubscriptionSettings.h b/qpid/cpp/src/qpid/client/SubscriptionSettings.h
index bee39f6816..bee39f6816 100644
--- a/cpp/src/qpid/client/SubscriptionSettings.h
+++ b/qpid/cpp/src/qpid/client/SubscriptionSettings.h
diff --git a/cpp/src/qpid/client/TCPConnector.cpp b/qpid/cpp/src/qpid/client/TCPConnector.cpp
index 0a570fb1d9..0a570fb1d9 100644
--- a/cpp/src/qpid/client/TCPConnector.cpp
+++ b/qpid/cpp/src/qpid/client/TCPConnector.cpp
diff --git a/cpp/src/qpid/client/TCPConnector.h b/qpid/cpp/src/qpid/client/TCPConnector.h
index 20bd2fa5b8..20bd2fa5b8 100644
--- a/cpp/src/qpid/client/TCPConnector.h
+++ b/qpid/cpp/src/qpid/client/TCPConnector.h
diff --git a/cpp/src/qpid/client/TypedResult.h b/qpid/cpp/src/qpid/client/TypedResult.h
index 8e1a16580c..8e1a16580c 100644
--- a/cpp/src/qpid/client/TypedResult.h
+++ b/qpid/cpp/src/qpid/client/TypedResult.h
diff --git a/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
index d2accddcd0..d2accddcd0 100644
--- a/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/AcceptTracker.h b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.h
index 85209c3b87..85209c3b87 100644
--- a/cpp/src/qpid/client/amqp0_10/AcceptTracker.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AcceptTracker.h
diff --git a/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
index ed931c90fb..ed931c90fb 100644
--- a/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/AddressResolution.h b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h
index fc8f1a1d18..fc8f1a1d18 100644
--- a/cpp/src/qpid/client/amqp0_10/AddressResolution.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.h
diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
index 11ef06e517..11ef06e517 100644
--- a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
index bf8a759107..bf8a759107 100644
--- a/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/ConnectionImpl.h
diff --git a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
index 2ca2c85c64..2ca2c85c64 100644
--- a/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/IncomingMessages.h b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.h
index 4c9ee68ece..4c9ee68ece 100644
--- a/cpp/src/qpid/client/amqp0_10/IncomingMessages.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/IncomingMessages.h
diff --git a/cpp/src/qpid/client/amqp0_10/MessageSink.h b/qpid/cpp/src/qpid/client/amqp0_10/MessageSink.h
index d66d2ecb3c..d66d2ecb3c 100644
--- a/cpp/src/qpid/client/amqp0_10/MessageSink.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/MessageSink.h
diff --git a/cpp/src/qpid/client/amqp0_10/MessageSource.h b/qpid/cpp/src/qpid/client/amqp0_10/MessageSource.h
index 74f2732f59..74f2732f59 100644
--- a/cpp/src/qpid/client/amqp0_10/MessageSource.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/MessageSource.h
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
index f2b205a78a..f2b205a78a 100644
--- a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
index a17ef03e10..a17ef03e10 100644
--- a/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/OutgoingMessage.h
diff --git a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
index c356bc298b..c356bc298b 100644
--- a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
index 0d3366907b..0d3366907b 100644
--- a/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
diff --git a/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
index 7575aaa306..7575aaa306 100644
--- a/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/SenderImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
index 35ce82cf5d..35ce82cf5d 100644
--- a/cpp/src/qpid/client/amqp0_10/SenderImpl.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp b/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
index 1e2b68b24e..1e2b68b24e 100644
--- a/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
diff --git a/cpp/src/qpid/client/amqp0_10/SessionImpl.h b/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
index 2bb72aa877..2bb72aa877 100644
--- a/cpp/src/qpid/client/amqp0_10/SessionImpl.h
+++ b/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
diff --git a/cpp/src/qpid/client/ssl.h b/qpid/cpp/src/qpid/client/ssl.h
index 0adef21f7e..0adef21f7e 100644
--- a/cpp/src/qpid/client/ssl.h
+++ b/qpid/cpp/src/qpid/client/ssl.h
diff --git a/cpp/src/qpid/client/windows/ClientDllMain.cpp b/qpid/cpp/src/qpid/client/windows/ClientDllMain.cpp
index d636489908..d636489908 100644
--- a/cpp/src/qpid/client/windows/ClientDllMain.cpp
+++ b/qpid/cpp/src/qpid/client/windows/ClientDllMain.cpp
diff --git a/cpp/src/qpid/client/windows/SaslFactory.cpp b/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
index 0f02c572ce..0f02c572ce 100644
--- a/cpp/src/qpid/client/windows/SaslFactory.cpp
+++ b/qpid/cpp/src/qpid/client/windows/SaslFactory.cpp
diff --git a/cpp/src/qpid/client/windows/SslConnector.cpp b/qpid/cpp/src/qpid/client/windows/SslConnector.cpp
index dc82ece9d1..dc82ece9d1 100644
--- a/cpp/src/qpid/client/windows/SslConnector.cpp
+++ b/qpid/cpp/src/qpid/client/windows/SslConnector.cpp
diff --git a/cpp/src/qpid/framing/AMQBody.cpp b/qpid/cpp/src/qpid/framing/AMQBody.cpp
index b3eeae0615..b3eeae0615 100644
--- a/cpp/src/qpid/framing/AMQBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQBody.cpp
diff --git a/cpp/src/qpid/framing/AMQBody.h b/qpid/cpp/src/qpid/framing/AMQBody.h
index 56d1d250c1..56d1d250c1 100644
--- a/cpp/src/qpid/framing/AMQBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQBody.h
diff --git a/cpp/src/qpid/framing/AMQContentBody.cpp b/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
index 18f6994f8f..18f6994f8f 100644
--- a/cpp/src/qpid/framing/AMQContentBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
diff --git a/cpp/src/qpid/framing/AMQContentBody.h b/qpid/cpp/src/qpid/framing/AMQContentBody.h
index 148b293a2f..148b293a2f 100644
--- a/cpp/src/qpid/framing/AMQContentBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQContentBody.h
diff --git a/cpp/src/qpid/framing/AMQDataBlock.h b/qpid/cpp/src/qpid/framing/AMQDataBlock.h
index 7f0d0dc2b5..7f0d0dc2b5 100644
--- a/cpp/src/qpid/framing/AMQDataBlock.h
+++ b/qpid/cpp/src/qpid/framing/AMQDataBlock.h
diff --git a/cpp/src/qpid/framing/AMQFrame.cpp b/qpid/cpp/src/qpid/framing/AMQFrame.cpp
index 5e065d598c..5e065d598c 100644
--- a/cpp/src/qpid/framing/AMQFrame.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQFrame.cpp
diff --git a/cpp/src/qpid/framing/AMQFrame.h b/qpid/cpp/src/qpid/framing/AMQFrame.h
index 19675ce6ff..19675ce6ff 100644
--- a/cpp/src/qpid/framing/AMQFrame.h
+++ b/qpid/cpp/src/qpid/framing/AMQFrame.h
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.cpp b/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
index 14218f1b45..14218f1b45 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.h b/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
index 452154eb5c..452154eb5c 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
index 477616221c..477616221c 100644
--- a/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
diff --git a/cpp/src/qpid/framing/AMQHeartbeatBody.h b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
index 19ac2be013..19ac2be013 100644
--- a/cpp/src/qpid/framing/AMQHeartbeatBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
diff --git a/cpp/src/qpid/framing/AMQMethodBody.cpp b/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
index 594af4c6dc..594af4c6dc 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
diff --git a/cpp/src/qpid/framing/AMQMethodBody.h b/qpid/cpp/src/qpid/framing/AMQMethodBody.h
index c634180712..c634180712 100644
--- a/cpp/src/qpid/framing/AMQMethodBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQMethodBody.h
diff --git a/cpp/src/qpid/framing/AMQP_HighestVersion.h b/qpid/cpp/src/qpid/framing/AMQP_HighestVersion.h
index 42139c7937..42139c7937 100644
--- a/cpp/src/qpid/framing/AMQP_HighestVersion.h
+++ b/qpid/cpp/src/qpid/framing/AMQP_HighestVersion.h
diff --git a/cpp/src/qpid/framing/AccumulatedAck.cpp b/qpid/cpp/src/qpid/framing/AccumulatedAck.cpp
index 2e6433a82f..2e6433a82f 100644
--- a/cpp/src/qpid/framing/AccumulatedAck.cpp
+++ b/qpid/cpp/src/qpid/framing/AccumulatedAck.cpp
diff --git a/cpp/src/qpid/framing/AccumulatedAck.h b/qpid/cpp/src/qpid/framing/AccumulatedAck.h
index 8e241b4ba1..8e241b4ba1 100644
--- a/cpp/src/qpid/framing/AccumulatedAck.h
+++ b/qpid/cpp/src/qpid/framing/AccumulatedAck.h
diff --git a/cpp/src/qpid/framing/Array.cpp b/qpid/cpp/src/qpid/framing/Array.cpp
index 4b4338f931..4b4338f931 100644
--- a/cpp/src/qpid/framing/Array.cpp
+++ b/qpid/cpp/src/qpid/framing/Array.cpp
diff --git a/cpp/src/qpid/framing/Array.h b/qpid/cpp/src/qpid/framing/Array.h
index 6254f6271a..6254f6271a 100644
--- a/cpp/src/qpid/framing/Array.h
+++ b/qpid/cpp/src/qpid/framing/Array.h
diff --git a/cpp/src/qpid/framing/Blob.cpp b/qpid/cpp/src/qpid/framing/Blob.cpp
index 0c8316f3d2..0c8316f3d2 100644
--- a/cpp/src/qpid/framing/Blob.cpp
+++ b/qpid/cpp/src/qpid/framing/Blob.cpp
diff --git a/cpp/src/qpid/framing/Blob.h b/qpid/cpp/src/qpid/framing/Blob.h
index 9878d92fe4..9878d92fe4 100644
--- a/cpp/src/qpid/framing/Blob.h
+++ b/qpid/cpp/src/qpid/framing/Blob.h
diff --git a/cpp/src/qpid/framing/BodyFactory.h b/qpid/cpp/src/qpid/framing/BodyFactory.h
index 6a8d9b1988..6a8d9b1988 100644
--- a/cpp/src/qpid/framing/BodyFactory.h
+++ b/qpid/cpp/src/qpid/framing/BodyFactory.h
diff --git a/cpp/src/qpid/framing/Buffer.cpp b/qpid/cpp/src/qpid/framing/Buffer.cpp
index 1c4caef046..1c4caef046 100644
--- a/cpp/src/qpid/framing/Buffer.cpp
+++ b/qpid/cpp/src/qpid/framing/Buffer.cpp
diff --git a/cpp/src/qpid/framing/Buffer.h b/qpid/cpp/src/qpid/framing/Buffer.h
index 166b524e3c..166b524e3c 100644
--- a/cpp/src/qpid/framing/Buffer.h
+++ b/qpid/cpp/src/qpid/framing/Buffer.h
diff --git a/cpp/src/qpid/framing/BufferTypes.h b/qpid/cpp/src/qpid/framing/BufferTypes.h
index 4199755852..4199755852 100644
--- a/cpp/src/qpid/framing/BufferTypes.h
+++ b/qpid/cpp/src/qpid/framing/BufferTypes.h
diff --git a/cpp/src/qpid/framing/ChannelHandler.h b/qpid/cpp/src/qpid/framing/ChannelHandler.h
index ddab204578..ddab204578 100644
--- a/cpp/src/qpid/framing/ChannelHandler.h
+++ b/qpid/cpp/src/qpid/framing/ChannelHandler.h
diff --git a/cpp/src/qpid/framing/Endian.h b/qpid/cpp/src/qpid/framing/Endian.h
index faf553fed5..faf553fed5 100644
--- a/cpp/src/qpid/framing/Endian.h
+++ b/qpid/cpp/src/qpid/framing/Endian.h
diff --git a/cpp/src/qpid/framing/FieldTable.cpp b/qpid/cpp/src/qpid/framing/FieldTable.cpp
index 0b677a6ccb..0b677a6ccb 100644
--- a/cpp/src/qpid/framing/FieldTable.cpp
+++ b/qpid/cpp/src/qpid/framing/FieldTable.cpp
diff --git a/cpp/src/qpid/framing/FieldTable.h b/qpid/cpp/src/qpid/framing/FieldTable.h
index 1986a72d10..1986a72d10 100644
--- a/cpp/src/qpid/framing/FieldTable.h
+++ b/qpid/cpp/src/qpid/framing/FieldTable.h
diff --git a/cpp/src/qpid/framing/FieldValue.cpp b/qpid/cpp/src/qpid/framing/FieldValue.cpp
index 227c12e44e..227c12e44e 100644
--- a/cpp/src/qpid/framing/FieldValue.cpp
+++ b/qpid/cpp/src/qpid/framing/FieldValue.cpp
diff --git a/cpp/src/qpid/framing/FieldValue.h b/qpid/cpp/src/qpid/framing/FieldValue.h
index e20244e7c9..e20244e7c9 100644
--- a/cpp/src/qpid/framing/FieldValue.h
+++ b/qpid/cpp/src/qpid/framing/FieldValue.h
diff --git a/cpp/src/qpid/framing/FrameDecoder.cpp b/qpid/cpp/src/qpid/framing/FrameDecoder.cpp
index 90cbbd84a1..90cbbd84a1 100644
--- a/cpp/src/qpid/framing/FrameDecoder.cpp
+++ b/qpid/cpp/src/qpid/framing/FrameDecoder.cpp
diff --git a/cpp/src/qpid/framing/FrameDecoder.h b/qpid/cpp/src/qpid/framing/FrameDecoder.h
index 26bed6c447..26bed6c447 100644
--- a/cpp/src/qpid/framing/FrameDecoder.h
+++ b/qpid/cpp/src/qpid/framing/FrameDecoder.h
diff --git a/cpp/src/qpid/framing/FrameDefaultVisitor.h b/qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h
index bd676960bf..bd676960bf 100644
--- a/cpp/src/qpid/framing/FrameDefaultVisitor.h
+++ b/qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h
diff --git a/cpp/src/qpid/framing/FrameHandler.h b/qpid/cpp/src/qpid/framing/FrameHandler.h
index fa1fb535ef..fa1fb535ef 100644
--- a/cpp/src/qpid/framing/FrameHandler.h
+++ b/qpid/cpp/src/qpid/framing/FrameHandler.h
diff --git a/cpp/src/qpid/framing/FrameSet.cpp b/qpid/cpp/src/qpid/framing/FrameSet.cpp
index 4089475c7a..4089475c7a 100644
--- a/cpp/src/qpid/framing/FrameSet.cpp
+++ b/qpid/cpp/src/qpid/framing/FrameSet.cpp
diff --git a/cpp/src/qpid/framing/FrameSet.h b/qpid/cpp/src/qpid/framing/FrameSet.h
index e234864dfd..e234864dfd 100644
--- a/cpp/src/qpid/framing/FrameSet.h
+++ b/qpid/cpp/src/qpid/framing/FrameSet.h
diff --git a/cpp/src/qpid/framing/Handler.h b/qpid/cpp/src/qpid/framing/Handler.h
index f2a9fccde0..f2a9fccde0 100644
--- a/cpp/src/qpid/framing/Handler.h
+++ b/qpid/cpp/src/qpid/framing/Handler.h
diff --git a/cpp/src/qpid/framing/HeaderProperties.h b/qpid/cpp/src/qpid/framing/HeaderProperties.h
index 8b1828daec..8b1828daec 100644
--- a/cpp/src/qpid/framing/HeaderProperties.h
+++ b/qpid/cpp/src/qpid/framing/HeaderProperties.h
diff --git a/cpp/src/qpid/framing/InitiationHandler.cpp b/qpid/cpp/src/qpid/framing/InitiationHandler.cpp
index 7ded505a47..7ded505a47 100644
--- a/cpp/src/qpid/framing/InitiationHandler.cpp
+++ b/qpid/cpp/src/qpid/framing/InitiationHandler.cpp
diff --git a/cpp/src/qpid/framing/InitiationHandler.h b/qpid/cpp/src/qpid/framing/InitiationHandler.h
index 5dfcc6b468..5dfcc6b468 100644
--- a/cpp/src/qpid/framing/InitiationHandler.h
+++ b/qpid/cpp/src/qpid/framing/InitiationHandler.h
diff --git a/cpp/src/qpid/framing/InputHandler.h b/qpid/cpp/src/qpid/framing/InputHandler.h
index 3efb23632a..3efb23632a 100644
--- a/cpp/src/qpid/framing/InputHandler.h
+++ b/qpid/cpp/src/qpid/framing/InputHandler.h
diff --git a/cpp/src/qpid/framing/Invoker.h b/qpid/cpp/src/qpid/framing/Invoker.h
index 4f1cf7c331..4f1cf7c331 100644
--- a/cpp/src/qpid/framing/Invoker.h
+++ b/qpid/cpp/src/qpid/framing/Invoker.h
diff --git a/cpp/src/qpid/framing/IsInSequenceSet.h b/qpid/cpp/src/qpid/framing/IsInSequenceSet.h
index fe10c1b9fa..fe10c1b9fa 100644
--- a/cpp/src/qpid/framing/IsInSequenceSet.h
+++ b/qpid/cpp/src/qpid/framing/IsInSequenceSet.h
diff --git a/cpp/src/qpid/framing/List.cpp b/qpid/cpp/src/qpid/framing/List.cpp
index d7ea172bac..d7ea172bac 100644
--- a/cpp/src/qpid/framing/List.cpp
+++ b/qpid/cpp/src/qpid/framing/List.cpp
diff --git a/cpp/src/qpid/framing/List.h b/qpid/cpp/src/qpid/framing/List.h
index 681445947c..681445947c 100644
--- a/cpp/src/qpid/framing/List.h
+++ b/qpid/cpp/src/qpid/framing/List.h
diff --git a/cpp/src/qpid/framing/MethodBodyFactory.h b/qpid/cpp/src/qpid/framing/MethodBodyFactory.h
index 88bc444795..88bc444795 100644
--- a/cpp/src/qpid/framing/MethodBodyFactory.h
+++ b/qpid/cpp/src/qpid/framing/MethodBodyFactory.h
diff --git a/cpp/src/qpid/framing/MethodContent.h b/qpid/cpp/src/qpid/framing/MethodContent.h
index 58c9143cfa..58c9143cfa 100644
--- a/cpp/src/qpid/framing/MethodContent.h
+++ b/qpid/cpp/src/qpid/framing/MethodContent.h
diff --git a/cpp/src/qpid/framing/ModelMethod.h b/qpid/cpp/src/qpid/framing/ModelMethod.h
index d99bd06cfa..d99bd06cfa 100644
--- a/cpp/src/qpid/framing/ModelMethod.h
+++ b/qpid/cpp/src/qpid/framing/ModelMethod.h
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.cpp b/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
index 19cb3f0e3d..19cb3f0e3d 100644
--- a/cpp/src/qpid/framing/ProtocolInitiation.cpp
+++ b/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.h b/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
index fe6410af55..fe6410af55 100644
--- a/cpp/src/qpid/framing/ProtocolInitiation.h
+++ b/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
diff --git a/cpp/src/qpid/framing/ProtocolVersion.cpp b/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
index 269b861191..269b861191 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.cpp
+++ b/qpid/cpp/src/qpid/framing/ProtocolVersion.cpp
diff --git a/cpp/src/qpid/framing/ProtocolVersion.h b/qpid/cpp/src/qpid/framing/ProtocolVersion.h
index 92580baf1a..92580baf1a 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.h
+++ b/qpid/cpp/src/qpid/framing/ProtocolVersion.h
diff --git a/cpp/src/qpid/framing/Proxy.cpp b/qpid/cpp/src/qpid/framing/Proxy.cpp
index 452fb13b01..452fb13b01 100644
--- a/cpp/src/qpid/framing/Proxy.cpp
+++ b/qpid/cpp/src/qpid/framing/Proxy.cpp
diff --git a/cpp/src/qpid/framing/Proxy.h b/qpid/cpp/src/qpid/framing/Proxy.h
index 0884e9cbd2..0884e9cbd2 100644
--- a/cpp/src/qpid/framing/Proxy.h
+++ b/qpid/cpp/src/qpid/framing/Proxy.h
diff --git a/cpp/src/qpid/framing/ResizableBuffer.h b/qpid/cpp/src/qpid/framing/ResizableBuffer.h
index 0abc5ba7f4..0abc5ba7f4 100644
--- a/cpp/src/qpid/framing/ResizableBuffer.h
+++ b/qpid/cpp/src/qpid/framing/ResizableBuffer.h
diff --git a/cpp/src/qpid/framing/SendContent.cpp b/qpid/cpp/src/qpid/framing/SendContent.cpp
index 04b60396da..04b60396da 100644
--- a/cpp/src/qpid/framing/SendContent.cpp
+++ b/qpid/cpp/src/qpid/framing/SendContent.cpp
diff --git a/cpp/src/qpid/framing/SendContent.h b/qpid/cpp/src/qpid/framing/SendContent.h
index 1c464b9c8b..1c464b9c8b 100644
--- a/cpp/src/qpid/framing/SendContent.h
+++ b/qpid/cpp/src/qpid/framing/SendContent.h
diff --git a/cpp/src/qpid/framing/SequenceNumber.cpp b/qpid/cpp/src/qpid/framing/SequenceNumber.cpp
index 41cb236629..41cb236629 100644
--- a/cpp/src/qpid/framing/SequenceNumber.cpp
+++ b/qpid/cpp/src/qpid/framing/SequenceNumber.cpp
diff --git a/cpp/src/qpid/framing/SequenceNumber.h b/qpid/cpp/src/qpid/framing/SequenceNumber.h
index 00fa2469c8..00fa2469c8 100644
--- a/cpp/src/qpid/framing/SequenceNumber.h
+++ b/qpid/cpp/src/qpid/framing/SequenceNumber.h
diff --git a/cpp/src/qpid/framing/SequenceNumberSet.cpp b/qpid/cpp/src/qpid/framing/SequenceNumberSet.cpp
index e9d78f3c17..e9d78f3c17 100644
--- a/cpp/src/qpid/framing/SequenceNumberSet.cpp
+++ b/qpid/cpp/src/qpid/framing/SequenceNumberSet.cpp
diff --git a/cpp/src/qpid/framing/SequenceNumberSet.h b/qpid/cpp/src/qpid/framing/SequenceNumberSet.h
index c8356c8163..c8356c8163 100644
--- a/cpp/src/qpid/framing/SequenceNumberSet.h
+++ b/qpid/cpp/src/qpid/framing/SequenceNumberSet.h
diff --git a/cpp/src/qpid/framing/SequenceSet.cpp b/qpid/cpp/src/qpid/framing/SequenceSet.cpp
index 6510842c58..6510842c58 100644
--- a/cpp/src/qpid/framing/SequenceSet.cpp
+++ b/qpid/cpp/src/qpid/framing/SequenceSet.cpp
diff --git a/cpp/src/qpid/framing/SequenceSet.h b/qpid/cpp/src/qpid/framing/SequenceSet.h
index 827c8999b3..827c8999b3 100644
--- a/cpp/src/qpid/framing/SequenceSet.h
+++ b/qpid/cpp/src/qpid/framing/SequenceSet.h
diff --git a/cpp/src/qpid/framing/StructHelper.h b/qpid/cpp/src/qpid/framing/StructHelper.h
index fe2fa64ce7..fe2fa64ce7 100644
--- a/cpp/src/qpid/framing/StructHelper.h
+++ b/qpid/cpp/src/qpid/framing/StructHelper.h
diff --git a/cpp/src/qpid/framing/TransferContent.cpp b/qpid/cpp/src/qpid/framing/TransferContent.cpp
index d997b24304..d997b24304 100644
--- a/cpp/src/qpid/framing/TransferContent.cpp
+++ b/qpid/cpp/src/qpid/framing/TransferContent.cpp
diff --git a/cpp/src/qpid/framing/TransferContent.h b/qpid/cpp/src/qpid/framing/TransferContent.h
index 32663d7020..32663d7020 100644
--- a/cpp/src/qpid/framing/TransferContent.h
+++ b/qpid/cpp/src/qpid/framing/TransferContent.h
diff --git a/cpp/src/qpid/framing/TypeFilter.h b/qpid/cpp/src/qpid/framing/TypeFilter.h
index d1c42de583..d1c42de583 100644
--- a/cpp/src/qpid/framing/TypeFilter.h
+++ b/qpid/cpp/src/qpid/framing/TypeFilter.h
diff --git a/cpp/src/qpid/framing/Uuid.cpp b/qpid/cpp/src/qpid/framing/Uuid.cpp
index eb4c33be75..eb4c33be75 100644
--- a/cpp/src/qpid/framing/Uuid.cpp
+++ b/qpid/cpp/src/qpid/framing/Uuid.cpp
diff --git a/cpp/src/qpid/framing/Uuid.h b/qpid/cpp/src/qpid/framing/Uuid.h
index 906e20951f..906e20951f 100644
--- a/cpp/src/qpid/framing/Uuid.h
+++ b/qpid/cpp/src/qpid/framing/Uuid.h
diff --git a/cpp/src/qpid/framing/amqp_framing.h b/qpid/cpp/src/qpid/framing/amqp_framing.h
index bad1c08a46..bad1c08a46 100644
--- a/cpp/src/qpid/framing/amqp_framing.h
+++ b/qpid/cpp/src/qpid/framing/amqp_framing.h
diff --git a/cpp/src/qpid/framing/amqp_types.h b/qpid/cpp/src/qpid/framing/amqp_types.h
index 3fe8b68dcd..3fe8b68dcd 100644
--- a/cpp/src/qpid/framing/amqp_types.h
+++ b/qpid/cpp/src/qpid/framing/amqp_types.h
diff --git a/cpp/src/qpid/framing/amqp_types_full.h b/qpid/cpp/src/qpid/framing/amqp_types_full.h
index c5d84dedea..c5d84dedea 100644
--- a/cpp/src/qpid/framing/amqp_types_full.h
+++ b/qpid/cpp/src/qpid/framing/amqp_types_full.h
diff --git a/cpp/src/qpid/framing/frame_functors.h b/qpid/cpp/src/qpid/framing/frame_functors.h
index d2064d6a57..d2064d6a57 100644
--- a/cpp/src/qpid/framing/frame_functors.h
+++ b/qpid/cpp/src/qpid/framing/frame_functors.h
diff --git a/cpp/src/qpid/framing/variant.h b/qpid/cpp/src/qpid/framing/variant.h
index 8e13063385..8e13063385 100644
--- a/cpp/src/qpid/framing/variant.h
+++ b/qpid/cpp/src/qpid/framing/variant.h
diff --git a/cpp/src/qpid/ha/AlternateExchangeSetter.h b/qpid/cpp/src/qpid/ha/AlternateExchangeSetter.h
index fbf4755e7d..fbf4755e7d 100644
--- a/cpp/src/qpid/ha/AlternateExchangeSetter.h
+++ b/qpid/cpp/src/qpid/ha/AlternateExchangeSetter.h
diff --git a/cpp/src/qpid/ha/Backup.cpp b/qpid/cpp/src/qpid/ha/Backup.cpp
index f1b6eadd75..f1b6eadd75 100644
--- a/cpp/src/qpid/ha/Backup.cpp
+++ b/qpid/cpp/src/qpid/ha/Backup.cpp
diff --git a/cpp/src/qpid/ha/Backup.h b/qpid/cpp/src/qpid/ha/Backup.h
index 47c44aa59c..47c44aa59c 100644
--- a/cpp/src/qpid/ha/Backup.h
+++ b/qpid/cpp/src/qpid/ha/Backup.h
diff --git a/cpp/src/qpid/ha/BackupConnectionExcluder.h b/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h
index a58e666fa7..a58e666fa7 100644
--- a/cpp/src/qpid/ha/BackupConnectionExcluder.h
+++ b/qpid/cpp/src/qpid/ha/BackupConnectionExcluder.h
diff --git a/cpp/src/qpid/ha/BrokerInfo.cpp b/qpid/cpp/src/qpid/ha/BrokerInfo.cpp
index c8a652a7ab..c8a652a7ab 100644
--- a/cpp/src/qpid/ha/BrokerInfo.cpp
+++ b/qpid/cpp/src/qpid/ha/BrokerInfo.cpp
diff --git a/cpp/src/qpid/ha/BrokerInfo.h b/qpid/cpp/src/qpid/ha/BrokerInfo.h
index 92556a5c4b..92556a5c4b 100644
--- a/cpp/src/qpid/ha/BrokerInfo.h
+++ b/qpid/cpp/src/qpid/ha/BrokerInfo.h
diff --git a/cpp/src/qpid/ha/BrokerReplicator.cpp b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
index a62080932d..a62080932d 100644
--- a/cpp/src/qpid/ha/BrokerReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
diff --git a/cpp/src/qpid/ha/BrokerReplicator.h b/qpid/cpp/src/qpid/ha/BrokerReplicator.h
index 44e80263de..44e80263de 100644
--- a/cpp/src/qpid/ha/BrokerReplicator.h
+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.h
diff --git a/cpp/src/qpid/ha/ConnectionObserver.cpp b/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
index a824adb871..a824adb871 100644
--- a/cpp/src/qpid/ha/ConnectionObserver.cpp
+++ b/qpid/cpp/src/qpid/ha/ConnectionObserver.cpp
diff --git a/cpp/src/qpid/ha/ConnectionObserver.h b/qpid/cpp/src/qpid/ha/ConnectionObserver.h
index f447d479f0..f447d479f0 100644
--- a/cpp/src/qpid/ha/ConnectionObserver.h
+++ b/qpid/cpp/src/qpid/ha/ConnectionObserver.h
diff --git a/cpp/src/qpid/ha/Event.cpp b/qpid/cpp/src/qpid/ha/Event.cpp
index ff336d0b2b..ff336d0b2b 100644
--- a/cpp/src/qpid/ha/Event.cpp
+++ b/qpid/cpp/src/qpid/ha/Event.cpp
diff --git a/cpp/src/qpid/ha/Event.h b/qpid/cpp/src/qpid/ha/Event.h
index 7b96e36f64..7b96e36f64 100644
--- a/cpp/src/qpid/ha/Event.h
+++ b/qpid/cpp/src/qpid/ha/Event.h
diff --git a/cpp/src/qpid/ha/FailoverExchange.cpp b/qpid/cpp/src/qpid/ha/FailoverExchange.cpp
index 9bda5ea5bf..9bda5ea5bf 100644
--- a/cpp/src/qpid/ha/FailoverExchange.cpp
+++ b/qpid/cpp/src/qpid/ha/FailoverExchange.cpp
diff --git a/cpp/src/qpid/ha/FailoverExchange.h b/qpid/cpp/src/qpid/ha/FailoverExchange.h
index 5263bdfb03..5263bdfb03 100644
--- a/cpp/src/qpid/ha/FailoverExchange.h
+++ b/qpid/cpp/src/qpid/ha/FailoverExchange.h
diff --git a/cpp/src/qpid/ha/HaBroker.cpp b/qpid/cpp/src/qpid/ha/HaBroker.cpp
index 7699b0e1d2..7699b0e1d2 100644
--- a/cpp/src/qpid/ha/HaBroker.cpp
+++ b/qpid/cpp/src/qpid/ha/HaBroker.cpp
diff --git a/cpp/src/qpid/ha/HaBroker.h b/qpid/cpp/src/qpid/ha/HaBroker.h
index 023706e7e3..023706e7e3 100644
--- a/cpp/src/qpid/ha/HaBroker.h
+++ b/qpid/cpp/src/qpid/ha/HaBroker.h
diff --git a/cpp/src/qpid/ha/HaPlugin.cpp b/qpid/cpp/src/qpid/ha/HaPlugin.cpp
index 913a9b5084..913a9b5084 100644
--- a/cpp/src/qpid/ha/HaPlugin.cpp
+++ b/qpid/cpp/src/qpid/ha/HaPlugin.cpp
diff --git a/cpp/src/qpid/ha/IdSetter.h b/qpid/cpp/src/qpid/ha/IdSetter.h
index 94bc74668e..94bc74668e 100644
--- a/cpp/src/qpid/ha/IdSetter.h
+++ b/qpid/cpp/src/qpid/ha/IdSetter.h
diff --git a/cpp/src/qpid/ha/LogPrefix.cpp b/qpid/cpp/src/qpid/ha/LogPrefix.cpp
index c1ccf050c1..c1ccf050c1 100644
--- a/cpp/src/qpid/ha/LogPrefix.cpp
+++ b/qpid/cpp/src/qpid/ha/LogPrefix.cpp
diff --git a/cpp/src/qpid/ha/LogPrefix.h b/qpid/cpp/src/qpid/ha/LogPrefix.h
index 3b6bb17d99..3b6bb17d99 100644
--- a/cpp/src/qpid/ha/LogPrefix.h
+++ b/qpid/cpp/src/qpid/ha/LogPrefix.h
diff --git a/cpp/src/qpid/ha/Membership.cpp b/qpid/cpp/src/qpid/ha/Membership.cpp
index 92a0b7db70..92a0b7db70 100644
--- a/cpp/src/qpid/ha/Membership.cpp
+++ b/qpid/cpp/src/qpid/ha/Membership.cpp
diff --git a/cpp/src/qpid/ha/Membership.h b/qpid/cpp/src/qpid/ha/Membership.h
index 5590d255fa..5590d255fa 100644
--- a/cpp/src/qpid/ha/Membership.h
+++ b/qpid/cpp/src/qpid/ha/Membership.h
diff --git a/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp
index 870e4723b2..870e4723b2 100644
--- a/cpp/src/qpid/ha/Primary.cpp
+++ b/qpid/cpp/src/qpid/ha/Primary.cpp
diff --git a/cpp/src/qpid/ha/Primary.h b/qpid/cpp/src/qpid/ha/Primary.h
index 84d714fc01..84d714fc01 100644
--- a/cpp/src/qpid/ha/Primary.h
+++ b/qpid/cpp/src/qpid/ha/Primary.h
diff --git a/cpp/src/qpid/ha/PrimaryQueueLimits.h b/qpid/cpp/src/qpid/ha/PrimaryQueueLimits.h
index 6d0c55736a..6d0c55736a 100644
--- a/cpp/src/qpid/ha/PrimaryQueueLimits.h
+++ b/qpid/cpp/src/qpid/ha/PrimaryQueueLimits.h
diff --git a/cpp/src/qpid/ha/PrimaryTxObserver.cpp b/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
index 56815ef89d..56815ef89d 100644
--- a/cpp/src/qpid/ha/PrimaryTxObserver.cpp
+++ b/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
diff --git a/cpp/src/qpid/ha/PrimaryTxObserver.h b/qpid/cpp/src/qpid/ha/PrimaryTxObserver.h
index 6f445ee212..6f445ee212 100644
--- a/cpp/src/qpid/ha/PrimaryTxObserver.h
+++ b/qpid/cpp/src/qpid/ha/PrimaryTxObserver.h
diff --git a/cpp/src/qpid/ha/QueueGuard.cpp b/qpid/cpp/src/qpid/ha/QueueGuard.cpp
index b6b6037b6f..b6b6037b6f 100644
--- a/cpp/src/qpid/ha/QueueGuard.cpp
+++ b/qpid/cpp/src/qpid/ha/QueueGuard.cpp
diff --git a/cpp/src/qpid/ha/QueueGuard.h b/qpid/cpp/src/qpid/ha/QueueGuard.h
index 9bf61f31da..9bf61f31da 100644
--- a/cpp/src/qpid/ha/QueueGuard.h
+++ b/qpid/cpp/src/qpid/ha/QueueGuard.h
diff --git a/cpp/src/qpid/ha/QueueReplicator.cpp b/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
index 7997bc6aa9..7997bc6aa9 100644
--- a/cpp/src/qpid/ha/QueueReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/QueueReplicator.cpp
diff --git a/cpp/src/qpid/ha/QueueReplicator.h b/qpid/cpp/src/qpid/ha/QueueReplicator.h
index a4b31b6c9a..a4b31b6c9a 100644
--- a/cpp/src/qpid/ha/QueueReplicator.h
+++ b/qpid/cpp/src/qpid/ha/QueueReplicator.h
diff --git a/cpp/src/qpid/ha/QueueSnapshot.h b/qpid/cpp/src/qpid/ha/QueueSnapshot.h
index 577bd96ef7..577bd96ef7 100644
--- a/cpp/src/qpid/ha/QueueSnapshot.h
+++ b/qpid/cpp/src/qpid/ha/QueueSnapshot.h
diff --git a/cpp/src/qpid/ha/README.h b/qpid/cpp/src/qpid/ha/README.h
index 9e8eda7e0d..9e8eda7e0d 100644
--- a/cpp/src/qpid/ha/README.h
+++ b/qpid/cpp/src/qpid/ha/README.h
diff --git a/cpp/src/qpid/ha/RemoteBackup.cpp b/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
index d511b5bd0e..d511b5bd0e 100644
--- a/cpp/src/qpid/ha/RemoteBackup.cpp
+++ b/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
diff --git a/cpp/src/qpid/ha/RemoteBackup.h b/qpid/cpp/src/qpid/ha/RemoteBackup.h
index 77c493d27e..77c493d27e 100644
--- a/cpp/src/qpid/ha/RemoteBackup.h
+++ b/qpid/cpp/src/qpid/ha/RemoteBackup.h
diff --git a/cpp/src/qpid/ha/ReplicatingSubscription.cpp b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
index ca4dd0099f..ca4dd0099f 100644
--- a/cpp/src/qpid/ha/ReplicatingSubscription.cpp
+++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
diff --git a/cpp/src/qpid/ha/ReplicatingSubscription.h b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h
index d6d41dd2cf..d6d41dd2cf 100644
--- a/cpp/src/qpid/ha/ReplicatingSubscription.h
+++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h
diff --git a/cpp/src/qpid/ha/ReplicationTest.cpp b/qpid/cpp/src/qpid/ha/ReplicationTest.cpp
index d2152363fe..d2152363fe 100644
--- a/cpp/src/qpid/ha/ReplicationTest.cpp
+++ b/qpid/cpp/src/qpid/ha/ReplicationTest.cpp
diff --git a/cpp/src/qpid/ha/ReplicationTest.h b/qpid/cpp/src/qpid/ha/ReplicationTest.h
index 8b19dc2ee0..8b19dc2ee0 100644
--- a/cpp/src/qpid/ha/ReplicationTest.h
+++ b/qpid/cpp/src/qpid/ha/ReplicationTest.h
diff --git a/cpp/src/qpid/ha/Role.h b/qpid/cpp/src/qpid/ha/Role.h
index 5392ce1fff..5392ce1fff 100644
--- a/cpp/src/qpid/ha/Role.h
+++ b/qpid/cpp/src/qpid/ha/Role.h
diff --git a/cpp/src/qpid/ha/Settings.h b/qpid/cpp/src/qpid/ha/Settings.h
index 9d5a5e6ae0..9d5a5e6ae0 100644
--- a/cpp/src/qpid/ha/Settings.h
+++ b/qpid/cpp/src/qpid/ha/Settings.h
diff --git a/cpp/src/qpid/ha/StandAlone.h b/qpid/cpp/src/qpid/ha/StandAlone.h
index 01bcf1a0b3..01bcf1a0b3 100644
--- a/cpp/src/qpid/ha/StandAlone.h
+++ b/qpid/cpp/src/qpid/ha/StandAlone.h
diff --git a/cpp/src/qpid/ha/StatusCheck.cpp b/qpid/cpp/src/qpid/ha/StatusCheck.cpp
index 8acf8d6cdc..8acf8d6cdc 100644
--- a/cpp/src/qpid/ha/StatusCheck.cpp
+++ b/qpid/cpp/src/qpid/ha/StatusCheck.cpp
diff --git a/cpp/src/qpid/ha/StatusCheck.h b/qpid/cpp/src/qpid/ha/StatusCheck.h
index 087e586b2b..087e586b2b 100644
--- a/cpp/src/qpid/ha/StatusCheck.h
+++ b/qpid/cpp/src/qpid/ha/StatusCheck.h
diff --git a/cpp/src/qpid/ha/TxReplicatingSubscription.cpp b/qpid/cpp/src/qpid/ha/TxReplicatingSubscription.cpp
index 15b33fe89d..15b33fe89d 100644
--- a/cpp/src/qpid/ha/TxReplicatingSubscription.cpp
+++ b/qpid/cpp/src/qpid/ha/TxReplicatingSubscription.cpp
diff --git a/cpp/src/qpid/ha/TxReplicatingSubscription.h b/qpid/cpp/src/qpid/ha/TxReplicatingSubscription.h
index a363d262a0..a363d262a0 100644
--- a/cpp/src/qpid/ha/TxReplicatingSubscription.h
+++ b/qpid/cpp/src/qpid/ha/TxReplicatingSubscription.h
diff --git a/cpp/src/qpid/ha/TxReplicator.cpp b/qpid/cpp/src/qpid/ha/TxReplicator.cpp
index 33adc9780d..33adc9780d 100644
--- a/cpp/src/qpid/ha/TxReplicator.cpp
+++ b/qpid/cpp/src/qpid/ha/TxReplicator.cpp
diff --git a/cpp/src/qpid/ha/TxReplicator.h b/qpid/cpp/src/qpid/ha/TxReplicator.h
index c7599d21b1..c7599d21b1 100644
--- a/cpp/src/qpid/ha/TxReplicator.h
+++ b/qpid/cpp/src/qpid/ha/TxReplicator.h
diff --git a/cpp/src/qpid/ha/hash.h b/qpid/cpp/src/qpid/ha/hash.h
index 17f99fb666..17f99fb666 100644
--- a/cpp/src/qpid/ha/hash.h
+++ b/qpid/cpp/src/qpid/ha/hash.h
diff --git a/cpp/src/qpid/ha/management-schema.xml b/qpid/cpp/src/qpid/ha/management-schema.xml
index 3da482e732..3da482e732 100644
--- a/cpp/src/qpid/ha/management-schema.xml
+++ b/qpid/cpp/src/qpid/ha/management-schema.xml
diff --git a/cpp/src/qpid/ha/types.cpp b/qpid/cpp/src/qpid/ha/types.cpp
index 60cc0f27ce..60cc0f27ce 100644
--- a/cpp/src/qpid/ha/types.cpp
+++ b/qpid/cpp/src/qpid/ha/types.cpp
diff --git a/cpp/src/qpid/ha/types.h b/qpid/cpp/src/qpid/ha/types.h
index ae4b948dfc..ae4b948dfc 100644
--- a/cpp/src/qpid/ha/types.h
+++ b/qpid/cpp/src/qpid/ha/types.h
diff --git a/cpp/src/qpid/legacystore/BindingDbt.cpp b/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
index a48c156e71..a48c156e71 100644
--- a/cpp/src/qpid/legacystore/BindingDbt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
diff --git a/cpp/src/qpid/legacystore/BindingDbt.h b/qpid/cpp/src/qpid/legacystore/BindingDbt.h
index 63c7cd144e..63c7cd144e 100644
--- a/cpp/src/qpid/legacystore/BindingDbt.h
+++ b/qpid/cpp/src/qpid/legacystore/BindingDbt.h
diff --git a/cpp/src/qpid/legacystore/BufferValue.cpp b/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
index fb2c471cd7..fb2c471cd7 100644
--- a/cpp/src/qpid/legacystore/BufferValue.cpp
+++ b/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
diff --git a/cpp/src/qpid/legacystore/BufferValue.h b/qpid/cpp/src/qpid/legacystore/BufferValue.h
index 527fbcf577..527fbcf577 100644
--- a/cpp/src/qpid/legacystore/BufferValue.h
+++ b/qpid/cpp/src/qpid/legacystore/BufferValue.h
diff --git a/cpp/src/qpid/legacystore/Cursor.h b/qpid/cpp/src/qpid/legacystore/Cursor.h
index 0c869c29a0..0c869c29a0 100644
--- a/cpp/src/qpid/legacystore/Cursor.h
+++ b/qpid/cpp/src/qpid/legacystore/Cursor.h
diff --git a/cpp/src/qpid/legacystore/DataTokenImpl.cpp b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
index 796d4c02f0..796d4c02f0 100644
--- a/cpp/src/qpid/legacystore/DataTokenImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
diff --git a/cpp/src/qpid/legacystore/DataTokenImpl.h b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
index e01d471e1b..e01d471e1b 100644
--- a/cpp/src/qpid/legacystore/DataTokenImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
diff --git a/cpp/src/qpid/legacystore/IdDbt.cpp b/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
index d9edaf80e6..d9edaf80e6 100644
--- a/cpp/src/qpid/legacystore/IdDbt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
diff --git a/cpp/src/qpid/legacystore/IdDbt.h b/qpid/cpp/src/qpid/legacystore/IdDbt.h
index ecf5922963..ecf5922963 100644
--- a/cpp/src/qpid/legacystore/IdDbt.h
+++ b/qpid/cpp/src/qpid/legacystore/IdDbt.h
diff --git a/cpp/src/qpid/legacystore/IdSequence.cpp b/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
index 975b1107e7..975b1107e7 100644
--- a/cpp/src/qpid/legacystore/IdSequence.cpp
+++ b/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
diff --git a/cpp/src/qpid/legacystore/IdSequence.h b/qpid/cpp/src/qpid/legacystore/IdSequence.h
index 11d7ff61ca..11d7ff61ca 100644
--- a/cpp/src/qpid/legacystore/IdSequence.h
+++ b/qpid/cpp/src/qpid/legacystore/IdSequence.h
diff --git a/cpp/src/qpid/legacystore/JournalImpl.cpp b/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
index ba3f2aecae..ba3f2aecae 100644
--- a/cpp/src/qpid/legacystore/JournalImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
diff --git a/cpp/src/qpid/legacystore/JournalImpl.h b/qpid/cpp/src/qpid/legacystore/JournalImpl.h
index 7227b2ffd4..7227b2ffd4 100644
--- a/cpp/src/qpid/legacystore/JournalImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/JournalImpl.h
diff --git a/cpp/src/qpid/legacystore/MessageStoreImpl.cpp b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
index 7a1fea95d5..7a1fea95d5 100644
--- a/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
diff --git a/cpp/src/qpid/legacystore/MessageStoreImpl.h b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
index f6fa68e481..f6fa68e481 100644
--- a/cpp/src/qpid/legacystore/MessageStoreImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
diff --git a/cpp/src/qpid/legacystore/PreparedTransaction.cpp b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
index 50b81e2824..50b81e2824 100644
--- a/cpp/src/qpid/legacystore/PreparedTransaction.cpp
+++ b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
diff --git a/cpp/src/qpid/legacystore/PreparedTransaction.h b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.h
index c5f7b9458a..c5f7b9458a 100644
--- a/cpp/src/qpid/legacystore/PreparedTransaction.h
+++ b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.h
diff --git a/cpp/src/qpid/legacystore/StoreException.h b/qpid/cpp/src/qpid/legacystore/StoreException.h
index 6624aafd5a..6624aafd5a 100644
--- a/cpp/src/qpid/legacystore/StoreException.h
+++ b/qpid/cpp/src/qpid/legacystore/StoreException.h
diff --git a/cpp/src/qpid/legacystore/StorePlugin.cpp b/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
index 5cba10d0f9..5cba10d0f9 100644
--- a/cpp/src/qpid/legacystore/StorePlugin.cpp
+++ b/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
diff --git a/cpp/src/qpid/legacystore/TxnCtxt.cpp b/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp
index b02b5e887f..b02b5e887f 100644
--- a/cpp/src/qpid/legacystore/TxnCtxt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp
diff --git a/cpp/src/qpid/legacystore/TxnCtxt.h b/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
index 85f0226cdc..85f0226cdc 100644
--- a/cpp/src/qpid/legacystore/TxnCtxt.h
+++ b/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
diff --git a/cpp/src/qpid/legacystore/jrnl/aio.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
index ffbddd887e..ffbddd887e 100644
--- a/cpp/src/qpid/legacystore/jrnl/aio.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/aio.h b/qpid/cpp/src/qpid/legacystore/jrnl/aio.h
index b1de5f79f7..b1de5f79f7 100644
--- a/cpp/src/qpid/legacystore/jrnl/aio.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/aio.h
diff --git a/cpp/src/qpid/legacystore/jrnl/aio_callback.h b/qpid/cpp/src/qpid/legacystore/jrnl/aio_callback.h
index 90249278a5..90249278a5 100644
--- a/cpp/src/qpid/legacystore/jrnl/aio_callback.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/aio_callback.h
diff --git a/cpp/src/qpid/legacystore/jrnl/cvar.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
index e4010bf91f..e4010bf91f 100644
--- a/cpp/src/qpid/legacystore/jrnl/cvar.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/cvar.h b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h
index 0498e743a2..0498e743a2 100644
--- a/cpp/src/qpid/legacystore/jrnl/cvar.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h
diff --git a/cpp/src/qpid/legacystore/jrnl/data_tok.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
index ce7206d80d..ce7206d80d 100644
--- a/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/data_tok.h b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h
index e35f069399..e35f069399 100644
--- a/cpp/src/qpid/legacystore/jrnl/data_tok.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h
diff --git a/cpp/src/qpid/legacystore/jrnl/deq_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
index ae7081eac1..ae7081eac1 100644
--- a/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
index 270ebdd69e..270ebdd69e 100644
--- a/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/deq_rec.h b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h
index d870b658da..d870b658da 100644
--- a/cpp/src/qpid/legacystore/jrnl/deq_rec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
index 0d1e6116be..0d1e6116be 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
index d024b704a7..d024b704a7 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_map.h b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h
index 75404afebe..75404afebe 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_map.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
index 94f42066a0..94f42066a0 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_rec.h b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h
index 805a96a1aa..805a96a1aa 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_rec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h
diff --git a/cpp/src/qpid/legacystore/jrnl/enums.h b/qpid/cpp/src/qpid/legacystore/jrnl/enums.h
index 169a13fa4d..169a13fa4d 100644
--- a/cpp/src/qpid/legacystore/jrnl/enums.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enums.h
diff --git a/cpp/src/qpid/legacystore/jrnl/fcntl.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
index fbb176667e..fbb176667e 100644
--- a/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/fcntl.h b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h
index a75e3bc84d..a75e3bc84d 100644
--- a/cpp/src/qpid/legacystore/jrnl/fcntl.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h
diff --git a/cpp/src/qpid/legacystore/jrnl/file_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h
index db20834cbb..db20834cbb 100644
--- a/cpp/src/qpid/legacystore/jrnl/file_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jcfg.h b/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h
index 01d92ee985..01d92ee985 100644
--- a/cpp/src/qpid/legacystore/jrnl/jcfg.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jcntl.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
index 21fcf099b4..21fcf099b4 100644
--- a/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jcntl.h b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h
index 294e9ced05..294e9ced05 100644
--- a/cpp/src/qpid/legacystore/jrnl/jcntl.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jdir.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
index a874c6c945..a874c6c945 100644
--- a/cpp/src/qpid/legacystore/jrnl/jdir.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jdir.h b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h
index e129b794d6..e129b794d6 100644
--- a/cpp/src/qpid/legacystore/jrnl/jdir.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jerrno.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
index 4962ce63ab..4962ce63ab 100644
--- a/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jerrno.h b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.h
index 4c8b71c423..4c8b71c423 100644
--- a/cpp/src/qpid/legacystore/jrnl/jerrno.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jexception.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
index 5c571020e4..5c571020e4 100644
--- a/cpp/src/qpid/legacystore/jrnl/jexception.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jexception.h b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h
index 34d8373235..34d8373235 100644
--- a/cpp/src/qpid/legacystore/jrnl/jexception.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jinf.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
index 3326005d9b..3326005d9b 100644
--- a/cpp/src/qpid/legacystore/jrnl/jinf.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jinf.h b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.h
index 73f5386a19..73f5386a19 100644
--- a/cpp/src/qpid/legacystore/jrnl/jinf.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.h
diff --git a/cpp/src/qpid/legacystore/jrnl/jrec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
index 61b9b6cc9b..61b9b6cc9b 100644
--- a/cpp/src/qpid/legacystore/jrnl/jrec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/jrec.h b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h
index 9d0771cabd..9d0771cabd 100644
--- a/cpp/src/qpid/legacystore/jrnl/jrec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h
diff --git a/cpp/src/qpid/legacystore/jrnl/lp_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
index 8024ddadd2..8024ddadd2 100644
--- a/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/lp_map.h b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.h
index c43cbc0173..c43cbc0173 100644
--- a/cpp/src/qpid/legacystore/jrnl/lp_map.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.h
diff --git a/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
index d7b0c9f516..d7b0c9f516 100644
--- a/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/lpmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h
index be5c4494cc..be5c4494cc 100644
--- a/cpp/src/qpid/legacystore/jrnl/lpmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/pmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
index 3dc61e2661..3dc61e2661 100644
--- a/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/pmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h
index 64115e225e..64115e225e 100644
--- a/cpp/src/qpid/legacystore/jrnl/pmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rcvdat.h b/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h
index a7ef2341f0..a7ef2341f0 100644
--- a/cpp/src/qpid/legacystore/jrnl/rcvdat.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rec_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
index ff6325a760..ff6325a760 100644
--- a/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rec_tail.h b/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h
index 0c36151927..0c36151927 100644
--- a/cpp/src/qpid/legacystore/jrnl/rec_tail.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
index 9b5ed95e81..9b5ed95e81 100644
--- a/cpp/src/qpid/legacystore/jrnl/rfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/rfc.h b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h
index faa5d566ba..faa5d566ba 100644
--- a/cpp/src/qpid/legacystore/jrnl/rfc.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
index 204affd1d1..204affd1d1 100644
--- a/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/rmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.h
index 47a36ef35c..47a36ef35c 100644
--- a/cpp/src/qpid/legacystore/jrnl/rmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/rrfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
index fc6f5d427f..fc6f5d427f 100644
--- a/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/rrfc.h b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h
index 5066d6048a..5066d6048a 100644
--- a/cpp/src/qpid/legacystore/jrnl/rrfc.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h
diff --git a/cpp/src/qpid/legacystore/jrnl/slock.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
index 8f26d349ef..8f26d349ef 100644
--- a/cpp/src/qpid/legacystore/jrnl/slock.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/slock.h b/qpid/cpp/src/qpid/legacystore/jrnl/slock.h
index c05b5cf336..c05b5cf336 100644
--- a/cpp/src/qpid/legacystore/jrnl/slock.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/slock.h
diff --git a/cpp/src/qpid/legacystore/jrnl/smutex.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
index 6f8991ca5b..6f8991ca5b 100644
--- a/cpp/src/qpid/legacystore/jrnl/smutex.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/smutex.h b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h
index def0fb70f6..def0fb70f6 100644
--- a/cpp/src/qpid/legacystore/jrnl/smutex.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h
diff --git a/cpp/src/qpid/legacystore/jrnl/time_ns.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
index 976068ef68..976068ef68 100644
--- a/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/time_ns.h b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.h
index a9f69e2631..a9f69e2631 100644
--- a/cpp/src/qpid/legacystore/jrnl/time_ns.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.h
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
index 94b812ccec..94b812ccec 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
index c514670601..c514670601 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_map.h b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h
index 6b38564e53..6b38564e53 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_map.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
index 1008e7700e..1008e7700e 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_rec.h b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h
index 1a49df1c96..1a49df1c96 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_rec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h
diff --git a/cpp/src/qpid/legacystore/jrnl/wmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
index 4353fcfbca..4353fcfbca 100644
--- a/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/wmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h
index 8347221b1d..8347221b1d 100644
--- a/cpp/src/qpid/legacystore/jrnl/wmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h
diff --git a/cpp/src/qpid/legacystore/jrnl/wrfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
index 64ee65f1ac..64ee65f1ac 100644
--- a/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
diff --git a/cpp/src/qpid/legacystore/jrnl/wrfc.h b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h
index f0e4e73151..f0e4e73151 100644
--- a/cpp/src/qpid/legacystore/jrnl/wrfc.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h
diff --git a/cpp/src/qpid/legacystore/management-schema.xml b/qpid/cpp/src/qpid/legacystore/management-schema.xml
index 71497cc0f9..71497cc0f9 100644
--- a/cpp/src/qpid/legacystore/management-schema.xml
+++ b/qpid/cpp/src/qpid/legacystore/management-schema.xml
diff --git a/cpp/src/qpid/linearstore/BindingDbt.cpp b/qpid/cpp/src/qpid/linearstore/BindingDbt.cpp
index 47738cce39..47738cce39 100644
--- a/cpp/src/qpid/linearstore/BindingDbt.cpp
+++ b/qpid/cpp/src/qpid/linearstore/BindingDbt.cpp
diff --git a/cpp/src/qpid/linearstore/BindingDbt.h b/qpid/cpp/src/qpid/linearstore/BindingDbt.h
index e5d61de248..e5d61de248 100644
--- a/cpp/src/qpid/linearstore/BindingDbt.h
+++ b/qpid/cpp/src/qpid/linearstore/BindingDbt.h
diff --git a/cpp/src/qpid/linearstore/BufferValue.cpp b/qpid/cpp/src/qpid/linearstore/BufferValue.cpp
index 5115055375..5115055375 100644
--- a/cpp/src/qpid/linearstore/BufferValue.cpp
+++ b/qpid/cpp/src/qpid/linearstore/BufferValue.cpp
diff --git a/cpp/src/qpid/linearstore/BufferValue.h b/qpid/cpp/src/qpid/linearstore/BufferValue.h
index daeb81306a..daeb81306a 100644
--- a/cpp/src/qpid/linearstore/BufferValue.h
+++ b/qpid/cpp/src/qpid/linearstore/BufferValue.h
diff --git a/cpp/src/qpid/linearstore/Cursor.h b/qpid/cpp/src/qpid/linearstore/Cursor.h
index 0287803b21..0287803b21 100644
--- a/cpp/src/qpid/linearstore/Cursor.h
+++ b/qpid/cpp/src/qpid/linearstore/Cursor.h
diff --git a/cpp/src/qpid/linearstore/DataTokenImpl.cpp b/qpid/cpp/src/qpid/linearstore/DataTokenImpl.cpp
index 0b1f3d7941..0b1f3d7941 100644
--- a/cpp/src/qpid/linearstore/DataTokenImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/DataTokenImpl.cpp
diff --git a/cpp/src/qpid/linearstore/DataTokenImpl.h b/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h
index 7152cef6a0..7152cef6a0 100644
--- a/cpp/src/qpid/linearstore/DataTokenImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/DataTokenImpl.h
diff --git a/cpp/src/qpid/linearstore/ISSUES b/qpid/cpp/src/qpid/linearstore/ISSUES
index 4023ba9629..4023ba9629 100644
--- a/cpp/src/qpid/linearstore/ISSUES
+++ b/qpid/cpp/src/qpid/linearstore/ISSUES
diff --git a/cpp/src/qpid/linearstore/IdDbt.cpp b/qpid/cpp/src/qpid/linearstore/IdDbt.cpp
index d427085bbe..d427085bbe 100644
--- a/cpp/src/qpid/linearstore/IdDbt.cpp
+++ b/qpid/cpp/src/qpid/linearstore/IdDbt.cpp
diff --git a/cpp/src/qpid/linearstore/IdDbt.h b/qpid/cpp/src/qpid/linearstore/IdDbt.h
index c7264491ab..c7264491ab 100644
--- a/cpp/src/qpid/linearstore/IdDbt.h
+++ b/qpid/cpp/src/qpid/linearstore/IdDbt.h
diff --git a/cpp/src/qpid/linearstore/IdSequence.cpp b/qpid/cpp/src/qpid/linearstore/IdSequence.cpp
index 4d3172ffe9..4d3172ffe9 100644
--- a/cpp/src/qpid/linearstore/IdSequence.cpp
+++ b/qpid/cpp/src/qpid/linearstore/IdSequence.cpp
diff --git a/cpp/src/qpid/linearstore/IdSequence.h b/qpid/cpp/src/qpid/linearstore/IdSequence.h
index 17996eec52..17996eec52 100644
--- a/cpp/src/qpid/linearstore/IdSequence.h
+++ b/qpid/cpp/src/qpid/linearstore/IdSequence.h
diff --git a/cpp/src/qpid/linearstore/JournalImpl.cpp b/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
index b2d41275a0..b2d41275a0 100644
--- a/cpp/src/qpid/linearstore/JournalImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/JournalImpl.cpp
diff --git a/cpp/src/qpid/linearstore/JournalImpl.h b/qpid/cpp/src/qpid/linearstore/JournalImpl.h
index 667579253e..667579253e 100644
--- a/cpp/src/qpid/linearstore/JournalImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/JournalImpl.h
diff --git a/cpp/src/qpid/linearstore/JournalLogImpl.cpp b/qpid/cpp/src/qpid/linearstore/JournalLogImpl.cpp
index c3e631a6ca..c3e631a6ca 100644
--- a/cpp/src/qpid/linearstore/JournalLogImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/JournalLogImpl.cpp
diff --git a/cpp/src/qpid/linearstore/JournalLogImpl.h b/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
index 846eaac124..846eaac124 100644
--- a/cpp/src/qpid/linearstore/JournalLogImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/JournalLogImpl.h
diff --git a/cpp/src/qpid/linearstore/MessageStoreImpl.cpp b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
index 70eac27f48..70eac27f48 100644
--- a/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.cpp
diff --git a/cpp/src/qpid/linearstore/MessageStoreImpl.h b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
index 236fcf2cf8..236fcf2cf8 100644
--- a/cpp/src/qpid/linearstore/MessageStoreImpl.h
+++ b/qpid/cpp/src/qpid/linearstore/MessageStoreImpl.h
diff --git a/cpp/src/qpid/linearstore/PreparedTransaction.cpp b/qpid/cpp/src/qpid/linearstore/PreparedTransaction.cpp
index 1b92ca8c23..1b92ca8c23 100644
--- a/cpp/src/qpid/linearstore/PreparedTransaction.cpp
+++ b/qpid/cpp/src/qpid/linearstore/PreparedTransaction.cpp
diff --git a/cpp/src/qpid/linearstore/PreparedTransaction.h b/qpid/cpp/src/qpid/linearstore/PreparedTransaction.h
index 7b381ba3b9..7b381ba3b9 100644
--- a/cpp/src/qpid/linearstore/PreparedTransaction.h
+++ b/qpid/cpp/src/qpid/linearstore/PreparedTransaction.h
diff --git a/cpp/src/qpid/linearstore/StoreException.h b/qpid/cpp/src/qpid/linearstore/StoreException.h
index 7a598a524f..7a598a524f 100644
--- a/cpp/src/qpid/linearstore/StoreException.h
+++ b/qpid/cpp/src/qpid/linearstore/StoreException.h
diff --git a/cpp/src/qpid/linearstore/StorePlugin.cpp b/qpid/cpp/src/qpid/linearstore/StorePlugin.cpp
index cd8c7ed8a3..cd8c7ed8a3 100644
--- a/cpp/src/qpid/linearstore/StorePlugin.cpp
+++ b/qpid/cpp/src/qpid/linearstore/StorePlugin.cpp
diff --git a/cpp/src/qpid/linearstore/TxnCtxt.cpp b/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
index e26f0b8b6f..e26f0b8b6f 100644
--- a/cpp/src/qpid/linearstore/TxnCtxt.cpp
+++ b/qpid/cpp/src/qpid/linearstore/TxnCtxt.cpp
diff --git a/cpp/src/qpid/linearstore/TxnCtxt.h b/qpid/cpp/src/qpid/linearstore/TxnCtxt.h
index 764063a615..764063a615 100644
--- a/cpp/src/qpid/linearstore/TxnCtxt.h
+++ b/qpid/cpp/src/qpid/linearstore/TxnCtxt.h
diff --git a/cpp/src/qpid/linearstore/journal/AtomicCounter.h b/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h
index 73e5fecf93..73e5fecf93 100644
--- a/cpp/src/qpid/linearstore/journal/AtomicCounter.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/AtomicCounter.h
diff --git a/cpp/src/qpid/linearstore/journal/Checksum.cpp b/qpid/cpp/src/qpid/linearstore/journal/Checksum.cpp
index eaede12d8e..eaede12d8e 100644
--- a/cpp/src/qpid/linearstore/journal/Checksum.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/Checksum.cpp
diff --git a/cpp/src/qpid/linearstore/journal/Checksum.h b/qpid/cpp/src/qpid/linearstore/journal/Checksum.h
index d96aac2991..d96aac2991 100644
--- a/cpp/src/qpid/linearstore/journal/Checksum.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/Checksum.h
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
index 08db3f75bd..08db3f75bd 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.cpp
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePool.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
index dc567ff917..dc567ff917 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePool.h
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
index a02679736e..a02679736e 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.cpp
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
index d0aa7fa7d6..d0aa7fa7d6 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolManager.h
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
index 12d2db74b8..12d2db74b8 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.cpp
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
index 570e2b073f..570e2b073f 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolPartition.h
diff --git a/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
index 4cae4e6538..4cae4e6538 100644
--- a/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/EmptyFilePoolTypes.h
diff --git a/cpp/src/qpid/linearstore/journal/JournalFile.cpp b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp
index ed03a8413f..ed03a8413f 100644
--- a/cpp/src/qpid/linearstore/journal/JournalFile.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.cpp
diff --git a/cpp/src/qpid/linearstore/journal/JournalFile.h b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h
index e33830ef7f..e33830ef7f 100644
--- a/cpp/src/qpid/linearstore/journal/JournalFile.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalFile.h
diff --git a/cpp/src/qpid/linearstore/journal/JournalLog.cpp b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp
index c35ec97e91..c35ec97e91 100644
--- a/cpp/src/qpid/linearstore/journal/JournalLog.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.cpp
diff --git a/cpp/src/qpid/linearstore/journal/JournalLog.h b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.h
index cf503cb9d2..cf503cb9d2 100644
--- a/cpp/src/qpid/linearstore/journal/JournalLog.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/JournalLog.h
diff --git a/cpp/src/qpid/linearstore/journal/LinearFileController.cpp b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
index 08d565ca2e..08d565ca2e 100644
--- a/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.cpp
diff --git a/cpp/src/qpid/linearstore/journal/LinearFileController.h b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h
index 3cdfb72a37..3cdfb72a37 100644
--- a/cpp/src/qpid/linearstore/journal/LinearFileController.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/LinearFileController.h
diff --git a/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
index 254566e824..254566e824 100644
--- a/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.cpp
diff --git a/cpp/src/qpid/linearstore/journal/RecoveryManager.h b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h
index 55cc6f8329..55cc6f8329 100644
--- a/cpp/src/qpid/linearstore/journal/RecoveryManager.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/RecoveryManager.h
diff --git a/cpp/src/qpid/linearstore/journal/aio.h b/qpid/cpp/src/qpid/linearstore/journal/aio.h
index 14589e7580..14589e7580 100644
--- a/cpp/src/qpid/linearstore/journal/aio.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/aio.h
diff --git a/cpp/src/qpid/linearstore/journal/aio_callback.h b/qpid/cpp/src/qpid/linearstore/journal/aio_callback.h
index f21b62617b..f21b62617b 100644
--- a/cpp/src/qpid/linearstore/journal/aio_callback.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/aio_callback.h
diff --git a/cpp/src/qpid/linearstore/journal/data_tok.cpp b/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp
index 3952c403a1..3952c403a1 100644
--- a/cpp/src/qpid/linearstore/journal/data_tok.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/data_tok.cpp
diff --git a/cpp/src/qpid/linearstore/journal/data_tok.h b/qpid/cpp/src/qpid/linearstore/journal/data_tok.h
index 67e0ec9683..67e0ec9683 100644
--- a/cpp/src/qpid/linearstore/journal/data_tok.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/data_tok.h
diff --git a/cpp/src/qpid/linearstore/journal/deq_rec.cpp b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp
index 90ca27d082..90ca27d082 100644
--- a/cpp/src/qpid/linearstore/journal/deq_rec.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.cpp
diff --git a/cpp/src/qpid/linearstore/journal/deq_rec.h b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h
index 9f55032e76..9f55032e76 100644
--- a/cpp/src/qpid/linearstore/journal/deq_rec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/deq_rec.h
diff --git a/cpp/src/qpid/linearstore/journal/enq_map.cpp b/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp
index 4eaaa64992..4eaaa64992 100644
--- a/cpp/src/qpid/linearstore/journal/enq_map.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_map.cpp
diff --git a/cpp/src/qpid/linearstore/journal/enq_map.h b/qpid/cpp/src/qpid/linearstore/journal/enq_map.h
index 912a583ab9..912a583ab9 100644
--- a/cpp/src/qpid/linearstore/journal/enq_map.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_map.h
diff --git a/cpp/src/qpid/linearstore/journal/enq_rec.cpp b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp
index 0fecd90cbf..0fecd90cbf 100644
--- a/cpp/src/qpid/linearstore/journal/enq_rec.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.cpp
diff --git a/cpp/src/qpid/linearstore/journal/enq_rec.h b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h
index d85cde42f5..d85cde42f5 100644
--- a/cpp/src/qpid/linearstore/journal/enq_rec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/enq_rec.h
diff --git a/cpp/src/qpid/linearstore/journal/enums.h b/qpid/cpp/src/qpid/linearstore/journal/enums.h
index 90ec355955..90ec355955 100644
--- a/cpp/src/qpid/linearstore/journal/enums.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/enums.h
diff --git a/cpp/src/qpid/linearstore/journal/jcfg.h b/qpid/cpp/src/qpid/linearstore/journal/jcfg.h
index b33a419a9d..b33a419a9d 100644
--- a/cpp/src/qpid/linearstore/journal/jcfg.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jcfg.h
diff --git a/cpp/src/qpid/linearstore/journal/jcntl.cpp b/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
index cc31f2e1df..cc31f2e1df 100644
--- a/cpp/src/qpid/linearstore/journal/jcntl.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jcntl.cpp
diff --git a/cpp/src/qpid/linearstore/journal/jcntl.h b/qpid/cpp/src/qpid/linearstore/journal/jcntl.h
index 94c00d2fab..94c00d2fab 100644
--- a/cpp/src/qpid/linearstore/journal/jcntl.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jcntl.h
diff --git a/cpp/src/qpid/linearstore/journal/jdir.cpp b/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp
index 72b94d0098..72b94d0098 100644
--- a/cpp/src/qpid/linearstore/journal/jdir.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jdir.cpp
diff --git a/cpp/src/qpid/linearstore/journal/jdir.h b/qpid/cpp/src/qpid/linearstore/journal/jdir.h
index 59f21ce499..59f21ce499 100644
--- a/cpp/src/qpid/linearstore/journal/jdir.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jdir.h
diff --git a/cpp/src/qpid/linearstore/journal/jerrno.cpp b/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp
index ce88e7809c..ce88e7809c 100644
--- a/cpp/src/qpid/linearstore/journal/jerrno.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jerrno.cpp
diff --git a/cpp/src/qpid/linearstore/journal/jerrno.h b/qpid/cpp/src/qpid/linearstore/journal/jerrno.h
index 6e817682ca..6e817682ca 100644
--- a/cpp/src/qpid/linearstore/journal/jerrno.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jerrno.h
diff --git a/cpp/src/qpid/linearstore/journal/jexception.cpp b/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp
index 49f486746a..49f486746a 100644
--- a/cpp/src/qpid/linearstore/journal/jexception.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/jexception.cpp
diff --git a/cpp/src/qpid/linearstore/journal/jexception.h b/qpid/cpp/src/qpid/linearstore/journal/jexception.h
index d03ee32e3f..d03ee32e3f 100644
--- a/cpp/src/qpid/linearstore/journal/jexception.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jexception.h
diff --git a/cpp/src/qpid/linearstore/journal/jrec.h b/qpid/cpp/src/qpid/linearstore/journal/jrec.h
index cad0e5d7a2..cad0e5d7a2 100644
--- a/cpp/src/qpid/linearstore/journal/jrec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/jrec.h
diff --git a/cpp/src/qpid/linearstore/journal/pmgr.cpp b/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp
index 764beaa879..764beaa879 100644
--- a/cpp/src/qpid/linearstore/journal/pmgr.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/pmgr.cpp
diff --git a/cpp/src/qpid/linearstore/journal/pmgr.h b/qpid/cpp/src/qpid/linearstore/journal/pmgr.h
index e618397647..e618397647 100644
--- a/cpp/src/qpid/linearstore/journal/pmgr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/pmgr.h
diff --git a/cpp/src/qpid/linearstore/journal/slock.h b/qpid/cpp/src/qpid/linearstore/journal/slock.h
index 12e9e2d08c..12e9e2d08c 100644
--- a/cpp/src/qpid/linearstore/journal/slock.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/slock.h
diff --git a/cpp/src/qpid/linearstore/journal/smutex.h b/qpid/cpp/src/qpid/linearstore/journal/smutex.h
index b43f55944c..b43f55944c 100644
--- a/cpp/src/qpid/linearstore/journal/smutex.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/smutex.h
diff --git a/cpp/src/qpid/linearstore/journal/time_ns.cpp b/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp
index 39f2cd1d88..39f2cd1d88 100644
--- a/cpp/src/qpid/linearstore/journal/time_ns.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/time_ns.cpp
diff --git a/cpp/src/qpid/linearstore/journal/time_ns.h b/qpid/cpp/src/qpid/linearstore/journal/time_ns.h
index a228d47475..a228d47475 100644
--- a/cpp/src/qpid/linearstore/journal/time_ns.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/time_ns.h
diff --git a/cpp/src/qpid/linearstore/journal/txn_map.cpp b/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp
index 8336d36b80..8336d36b80 100644
--- a/cpp/src/qpid/linearstore/journal/txn_map.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_map.cpp
diff --git a/cpp/src/qpid/linearstore/journal/txn_map.h b/qpid/cpp/src/qpid/linearstore/journal/txn_map.h
index e79c0522d8..e79c0522d8 100644
--- a/cpp/src/qpid/linearstore/journal/txn_map.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_map.h
diff --git a/cpp/src/qpid/linearstore/journal/txn_rec.cpp b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp
index 298ab608b1..298ab608b1 100644
--- a/cpp/src/qpid/linearstore/journal/txn_rec.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.cpp
diff --git a/cpp/src/qpid/linearstore/journal/txn_rec.h b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h
index 4552071595..4552071595 100644
--- a/cpp/src/qpid/linearstore/journal/txn_rec.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/txn_rec.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c
index b55c1c16c8..b55c1c16c8 100644
--- a/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h
index 3392867153..3392867153 100644
--- a/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/deq_hdr.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c
index b4e8b62ff1..b4e8b62ff1 100644
--- a/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h
index 00108792bc..00108792bc 100644
--- a/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/enq_hdr.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/file_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
index 4e6cf1b8fa..4e6cf1b8fa 100644
--- a/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/file_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.h
index 5987e1871e..5987e1871e 100644
--- a/cpp/src/qpid/linearstore/journal/utils/file_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/file_hdr.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c
index 32eda8de5a..32eda8de5a 100644
--- a/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h
index 64349b5ab8..64349b5ab8 100644
--- a/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_hdr.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/rec_tail.c b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.c
index 7128c96f32..7128c96f32 100644
--- a/cpp/src/qpid/linearstore/journal/utils/rec_tail.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/rec_tail.h b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.h
index afc71c104a..afc71c104a 100644
--- a/cpp/src/qpid/linearstore/journal/utils/rec_tail.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/rec_tail.h
diff --git a/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c
index 58d4cdebe4..58d4cdebe4 100644
--- a/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.c
diff --git a/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h
index 442a1d373d..442a1d373d 100644
--- a/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/utils/txn_hdr.h
diff --git a/cpp/src/qpid/linearstore/journal/wmgr.cpp b/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
index 1ff18da663..1ff18da663 100644
--- a/cpp/src/qpid/linearstore/journal/wmgr.cpp
+++ b/qpid/cpp/src/qpid/linearstore/journal/wmgr.cpp
diff --git a/cpp/src/qpid/linearstore/journal/wmgr.h b/qpid/cpp/src/qpid/linearstore/journal/wmgr.h
index 99da20bab9..99da20bab9 100644
--- a/cpp/src/qpid/linearstore/journal/wmgr.h
+++ b/qpid/cpp/src/qpid/linearstore/journal/wmgr.h
diff --git a/cpp/src/qpid/linearstore/management-schema.xml b/qpid/cpp/src/qpid/linearstore/management-schema.xml
index ebd388593e..ebd388593e 100644
--- a/cpp/src/qpid/linearstore/management-schema.xml
+++ b/qpid/cpp/src/qpid/linearstore/management-schema.xml
diff --git a/cpp/src/qpid/log/Helpers.h b/qpid/cpp/src/qpid/log/Helpers.h
index 82ef8244be..82ef8244be 100644
--- a/cpp/src/qpid/log/Helpers.h
+++ b/qpid/cpp/src/qpid/log/Helpers.h
diff --git a/cpp/src/qpid/log/Logger.cpp b/qpid/cpp/src/qpid/log/Logger.cpp
index fc254f2857..fc254f2857 100644
--- a/cpp/src/qpid/log/Logger.cpp
+++ b/qpid/cpp/src/qpid/log/Logger.cpp
diff --git a/cpp/src/qpid/log/Logger.h b/qpid/cpp/src/qpid/log/Logger.h
index 8c4beb0785..8c4beb0785 100644
--- a/cpp/src/qpid/log/Logger.h
+++ b/qpid/cpp/src/qpid/log/Logger.h
diff --git a/cpp/src/qpid/log/Options.cpp b/qpid/cpp/src/qpid/log/Options.cpp
index f816124b4e..f816124b4e 100644
--- a/cpp/src/qpid/log/Options.cpp
+++ b/qpid/cpp/src/qpid/log/Options.cpp
diff --git a/cpp/src/qpid/log/Options.h b/qpid/cpp/src/qpid/log/Options.h
index ed534168e8..ed534168e8 100644
--- a/cpp/src/qpid/log/Options.h
+++ b/qpid/cpp/src/qpid/log/Options.h
diff --git a/cpp/src/qpid/log/OstreamOutput.cpp b/qpid/cpp/src/qpid/log/OstreamOutput.cpp
index 9b6ec1f8aa..9b6ec1f8aa 100644
--- a/cpp/src/qpid/log/OstreamOutput.cpp
+++ b/qpid/cpp/src/qpid/log/OstreamOutput.cpp
diff --git a/cpp/src/qpid/log/OstreamOutput.h b/qpid/cpp/src/qpid/log/OstreamOutput.h
index 12fd4ce425..12fd4ce425 100644
--- a/cpp/src/qpid/log/OstreamOutput.h
+++ b/qpid/cpp/src/qpid/log/OstreamOutput.h
diff --git a/cpp/src/qpid/log/Selector.cpp b/qpid/cpp/src/qpid/log/Selector.cpp
index a517cb34f4..a517cb34f4 100644
--- a/cpp/src/qpid/log/Selector.cpp
+++ b/qpid/cpp/src/qpid/log/Selector.cpp
diff --git a/cpp/src/qpid/log/Selector.h b/qpid/cpp/src/qpid/log/Selector.h
index 1d025e9646..1d025e9646 100644
--- a/cpp/src/qpid/log/Selector.h
+++ b/qpid/cpp/src/qpid/log/Selector.h
diff --git a/cpp/src/qpid/log/SinkOptions.h b/qpid/cpp/src/qpid/log/SinkOptions.h
index 7ec2cfbc17..7ec2cfbc17 100644
--- a/cpp/src/qpid/log/SinkOptions.h
+++ b/qpid/cpp/src/qpid/log/SinkOptions.h
diff --git a/cpp/src/qpid/log/Statement.cpp b/qpid/cpp/src/qpid/log/Statement.cpp
index 86b069fd91..86b069fd91 100644
--- a/cpp/src/qpid/log/Statement.cpp
+++ b/qpid/cpp/src/qpid/log/Statement.cpp
diff --git a/cpp/src/qpid/log/Statement.h b/qpid/cpp/src/qpid/log/Statement.h
index 410ffaaa3d..410ffaaa3d 100644
--- a/cpp/src/qpid/log/Statement.h
+++ b/qpid/cpp/src/qpid/log/Statement.h
diff --git a/cpp/src/qpid/log/posix/SinkOptions.cpp b/qpid/cpp/src/qpid/log/posix/SinkOptions.cpp
index 210022551e..210022551e 100644
--- a/cpp/src/qpid/log/posix/SinkOptions.cpp
+++ b/qpid/cpp/src/qpid/log/posix/SinkOptions.cpp
diff --git a/cpp/src/qpid/log/posix/SinkOptions.h b/qpid/cpp/src/qpid/log/posix/SinkOptions.h
index d929c29025..d929c29025 100644
--- a/cpp/src/qpid/log/posix/SinkOptions.h
+++ b/qpid/cpp/src/qpid/log/posix/SinkOptions.h
diff --git a/cpp/src/qpid/log/windows/SinkOptions.cpp b/qpid/cpp/src/qpid/log/windows/SinkOptions.cpp
index 0c74bea64e..0c74bea64e 100644
--- a/cpp/src/qpid/log/windows/SinkOptions.cpp
+++ b/qpid/cpp/src/qpid/log/windows/SinkOptions.cpp
diff --git a/cpp/src/qpid/log/windows/SinkOptions.h b/qpid/cpp/src/qpid/log/windows/SinkOptions.h
index f270c504a2..f270c504a2 100644
--- a/cpp/src/qpid/log/windows/SinkOptions.h
+++ b/qpid/cpp/src/qpid/log/windows/SinkOptions.h
diff --git a/cpp/src/qpid/management/Args.h b/qpid/cpp/src/qpid/management/Args.h
index 5d1cb7e01d..5d1cb7e01d 100644
--- a/cpp/src/qpid/management/Args.h
+++ b/qpid/cpp/src/qpid/management/Args.h
diff --git a/cpp/src/qpid/management/Buffer.cpp b/qpid/cpp/src/qpid/management/Buffer.cpp
index 0ad6e9a851..0ad6e9a851 100644
--- a/cpp/src/qpid/management/Buffer.cpp
+++ b/qpid/cpp/src/qpid/management/Buffer.cpp
diff --git a/cpp/src/qpid/management/Buffer.h b/qpid/cpp/src/qpid/management/Buffer.h
index 1ac52bf276..1ac52bf276 100644
--- a/cpp/src/qpid/management/Buffer.h
+++ b/qpid/cpp/src/qpid/management/Buffer.h
diff --git a/cpp/src/qpid/management/ConnectionSettings.cpp b/qpid/cpp/src/qpid/management/ConnectionSettings.cpp
index 1421a26867..1421a26867 100644
--- a/cpp/src/qpid/management/ConnectionSettings.cpp
+++ b/qpid/cpp/src/qpid/management/ConnectionSettings.cpp
diff --git a/cpp/src/qpid/management/ConnectionSettings.h b/qpid/cpp/src/qpid/management/ConnectionSettings.h
index b631ffa658..b631ffa658 100644
--- a/cpp/src/qpid/management/ConnectionSettings.h
+++ b/qpid/cpp/src/qpid/management/ConnectionSettings.h
diff --git a/cpp/src/qpid/management/Manageable.cpp b/qpid/cpp/src/qpid/management/Manageable.cpp
index 651215ffb5..651215ffb5 100644
--- a/cpp/src/qpid/management/Manageable.cpp
+++ b/qpid/cpp/src/qpid/management/Manageable.cpp
diff --git a/cpp/src/qpid/management/Manageable.h b/qpid/cpp/src/qpid/management/Manageable.h
index ede5c29e43..ede5c29e43 100644
--- a/cpp/src/qpid/management/Manageable.h
+++ b/qpid/cpp/src/qpid/management/Manageable.h
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
index 516babce61..516babce61 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.cpp
diff --git a/cpp/src/qpid/management/ManagementAgent.h b/qpid/cpp/src/qpid/management/ManagementAgent.h
index 81bf542766..81bf542766 100644
--- a/cpp/src/qpid/management/ManagementAgent.h
+++ b/qpid/cpp/src/qpid/management/ManagementAgent.h
diff --git a/cpp/src/qpid/management/ManagementDirectExchange.cpp b/qpid/cpp/src/qpid/management/ManagementDirectExchange.cpp
index 8ede6940b0..8ede6940b0 100644
--- a/cpp/src/qpid/management/ManagementDirectExchange.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementDirectExchange.cpp
diff --git a/cpp/src/qpid/management/ManagementDirectExchange.h b/qpid/cpp/src/qpid/management/ManagementDirectExchange.h
index 582354d723..582354d723 100644
--- a/cpp/src/qpid/management/ManagementDirectExchange.h
+++ b/qpid/cpp/src/qpid/management/ManagementDirectExchange.h
diff --git a/cpp/src/qpid/management/ManagementEvent.h b/qpid/cpp/src/qpid/management/ManagementEvent.h
index e80175096f..e80175096f 100644
--- a/cpp/src/qpid/management/ManagementEvent.h
+++ b/qpid/cpp/src/qpid/management/ManagementEvent.h
diff --git a/cpp/src/qpid/management/ManagementObject.cpp b/qpid/cpp/src/qpid/management/ManagementObject.cpp
index 019963e832..019963e832 100644
--- a/cpp/src/qpid/management/ManagementObject.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementObject.cpp
diff --git a/cpp/src/qpid/management/ManagementObject.h b/qpid/cpp/src/qpid/management/ManagementObject.h
index 93fbec7bc7..93fbec7bc7 100644
--- a/cpp/src/qpid/management/ManagementObject.h
+++ b/qpid/cpp/src/qpid/management/ManagementObject.h
diff --git a/cpp/src/qpid/management/ManagementTopicExchange.cpp b/qpid/cpp/src/qpid/management/ManagementTopicExchange.cpp
index 0241d5a404..0241d5a404 100644
--- a/cpp/src/qpid/management/ManagementTopicExchange.cpp
+++ b/qpid/cpp/src/qpid/management/ManagementTopicExchange.cpp
diff --git a/cpp/src/qpid/management/ManagementTopicExchange.h b/qpid/cpp/src/qpid/management/ManagementTopicExchange.h
index f5192a0936..f5192a0936 100644
--- a/cpp/src/qpid/management/ManagementTopicExchange.h
+++ b/qpid/cpp/src/qpid/management/ManagementTopicExchange.h
diff --git a/cpp/src/qpid/management/Mutex.cpp b/qpid/cpp/src/qpid/management/Mutex.cpp
index f05abb01dc..f05abb01dc 100644
--- a/cpp/src/qpid/management/Mutex.cpp
+++ b/qpid/cpp/src/qpid/management/Mutex.cpp
diff --git a/cpp/src/qpid/management/Mutex.h b/qpid/cpp/src/qpid/management/Mutex.h
index 67ae04bae9..67ae04bae9 100644
--- a/cpp/src/qpid/management/Mutex.h
+++ b/qpid/cpp/src/qpid/management/Mutex.h
diff --git a/cpp/src/qpid/memory.h b/qpid/cpp/src/qpid/memory.h
index 99d7a71e7b..99d7a71e7b 100644
--- a/cpp/src/qpid/memory.h
+++ b/qpid/cpp/src/qpid/memory.h
diff --git a/cpp/src/qpid/messaging/Address.cpp b/qpid/cpp/src/qpid/messaging/Address.cpp
index 6fbaeef661..6fbaeef661 100644
--- a/cpp/src/qpid/messaging/Address.cpp
+++ b/qpid/cpp/src/qpid/messaging/Address.cpp
diff --git a/cpp/src/qpid/messaging/AddressImpl.h b/qpid/cpp/src/qpid/messaging/AddressImpl.h
index 8d34bd73c4..8d34bd73c4 100644
--- a/cpp/src/qpid/messaging/AddressImpl.h
+++ b/qpid/cpp/src/qpid/messaging/AddressImpl.h
diff --git a/cpp/src/qpid/messaging/AddressParser.cpp b/qpid/cpp/src/qpid/messaging/AddressParser.cpp
index 882deba463..882deba463 100644
--- a/cpp/src/qpid/messaging/AddressParser.cpp
+++ b/qpid/cpp/src/qpid/messaging/AddressParser.cpp
diff --git a/cpp/src/qpid/messaging/AddressParser.h b/qpid/cpp/src/qpid/messaging/AddressParser.h
index 5e429e1ca9..5e429e1ca9 100644
--- a/cpp/src/qpid/messaging/AddressParser.h
+++ b/qpid/cpp/src/qpid/messaging/AddressParser.h
diff --git a/cpp/src/qpid/messaging/Connection.cpp b/qpid/cpp/src/qpid/messaging/Connection.cpp
index c40d32cbc1..c40d32cbc1 100644
--- a/cpp/src/qpid/messaging/Connection.cpp
+++ b/qpid/cpp/src/qpid/messaging/Connection.cpp
diff --git a/cpp/src/qpid/messaging/ConnectionImpl.h b/qpid/cpp/src/qpid/messaging/ConnectionImpl.h
index 05d835b282..05d835b282 100644
--- a/cpp/src/qpid/messaging/ConnectionImpl.h
+++ b/qpid/cpp/src/qpid/messaging/ConnectionImpl.h
diff --git a/cpp/src/qpid/messaging/ConnectionOptions.cpp b/qpid/cpp/src/qpid/messaging/ConnectionOptions.cpp
index 10c131c22f..10c131c22f 100644
--- a/cpp/src/qpid/messaging/ConnectionOptions.cpp
+++ b/qpid/cpp/src/qpid/messaging/ConnectionOptions.cpp
diff --git a/cpp/src/qpid/messaging/ConnectionOptions.h b/qpid/cpp/src/qpid/messaging/ConnectionOptions.h
index c8c8798b7b..c8c8798b7b 100644
--- a/cpp/src/qpid/messaging/ConnectionOptions.h
+++ b/qpid/cpp/src/qpid/messaging/ConnectionOptions.h
diff --git a/cpp/src/qpid/messaging/Duration.cpp b/qpid/cpp/src/qpid/messaging/Duration.cpp
index a23e9f5bcb..a23e9f5bcb 100644
--- a/cpp/src/qpid/messaging/Duration.cpp
+++ b/qpid/cpp/src/qpid/messaging/Duration.cpp
diff --git a/cpp/src/qpid/messaging/FailoverUpdates.cpp b/qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp
index 4f2fcf2e82..4f2fcf2e82 100644
--- a/cpp/src/qpid/messaging/FailoverUpdates.cpp
+++ b/qpid/cpp/src/qpid/messaging/FailoverUpdates.cpp
diff --git a/cpp/src/qpid/messaging/Logger.cpp b/qpid/cpp/src/qpid/messaging/Logger.cpp
index c259cb4c1b..c259cb4c1b 100644
--- a/cpp/src/qpid/messaging/Logger.cpp
+++ b/qpid/cpp/src/qpid/messaging/Logger.cpp
diff --git a/cpp/src/qpid/messaging/Message.cpp b/qpid/cpp/src/qpid/messaging/Message.cpp
index 62ee93b6c2..62ee93b6c2 100644
--- a/cpp/src/qpid/messaging/Message.cpp
+++ b/qpid/cpp/src/qpid/messaging/Message.cpp
diff --git a/cpp/src/qpid/messaging/MessageImpl.cpp b/qpid/cpp/src/qpid/messaging/MessageImpl.cpp
index 620e48ec2e..620e48ec2e 100644
--- a/cpp/src/qpid/messaging/MessageImpl.cpp
+++ b/qpid/cpp/src/qpid/messaging/MessageImpl.cpp
diff --git a/cpp/src/qpid/messaging/MessageImpl.h b/qpid/cpp/src/qpid/messaging/MessageImpl.h
index 647972de16..647972de16 100644
--- a/cpp/src/qpid/messaging/MessageImpl.h
+++ b/qpid/cpp/src/qpid/messaging/MessageImpl.h
diff --git a/cpp/src/qpid/messaging/Message_io.cpp b/qpid/cpp/src/qpid/messaging/Message_io.cpp
index b6bc43a4e6..b6bc43a4e6 100644
--- a/cpp/src/qpid/messaging/Message_io.cpp
+++ b/qpid/cpp/src/qpid/messaging/Message_io.cpp
diff --git a/cpp/src/qpid/messaging/PrivateImplRef.h b/qpid/cpp/src/qpid/messaging/PrivateImplRef.h
index a60f4eeadf..a60f4eeadf 100644
--- a/cpp/src/qpid/messaging/PrivateImplRef.h
+++ b/qpid/cpp/src/qpid/messaging/PrivateImplRef.h
diff --git a/cpp/src/qpid/messaging/ProtocolRegistry.cpp b/qpid/cpp/src/qpid/messaging/ProtocolRegistry.cpp
index dbb0d6dfc2..dbb0d6dfc2 100644
--- a/cpp/src/qpid/messaging/ProtocolRegistry.cpp
+++ b/qpid/cpp/src/qpid/messaging/ProtocolRegistry.cpp
diff --git a/cpp/src/qpid/messaging/ProtocolRegistry.h b/qpid/cpp/src/qpid/messaging/ProtocolRegistry.h
index 6a6f5962c3..6a6f5962c3 100644
--- a/cpp/src/qpid/messaging/ProtocolRegistry.h
+++ b/qpid/cpp/src/qpid/messaging/ProtocolRegistry.h
diff --git a/cpp/src/qpid/messaging/Receiver.cpp b/qpid/cpp/src/qpid/messaging/Receiver.cpp
index a2c6b4cade..a2c6b4cade 100644
--- a/cpp/src/qpid/messaging/Receiver.cpp
+++ b/qpid/cpp/src/qpid/messaging/Receiver.cpp
diff --git a/cpp/src/qpid/messaging/ReceiverImpl.h b/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
index 59ccc3214e..59ccc3214e 100644
--- a/cpp/src/qpid/messaging/ReceiverImpl.h
+++ b/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
diff --git a/cpp/src/qpid/messaging/Sender.cpp b/qpid/cpp/src/qpid/messaging/Sender.cpp
index a26f2544c8..a26f2544c8 100644
--- a/cpp/src/qpid/messaging/Sender.cpp
+++ b/qpid/cpp/src/qpid/messaging/Sender.cpp
diff --git a/cpp/src/qpid/messaging/SenderImpl.h b/qpid/cpp/src/qpid/messaging/SenderImpl.h
index 91fd9b1536..91fd9b1536 100644
--- a/cpp/src/qpid/messaging/SenderImpl.h
+++ b/qpid/cpp/src/qpid/messaging/SenderImpl.h
diff --git a/cpp/src/qpid/messaging/Session.cpp b/qpid/cpp/src/qpid/messaging/Session.cpp
index fd0519705d..fd0519705d 100644
--- a/cpp/src/qpid/messaging/Session.cpp
+++ b/qpid/cpp/src/qpid/messaging/Session.cpp
diff --git a/cpp/src/qpid/messaging/SessionImpl.h b/qpid/cpp/src/qpid/messaging/SessionImpl.h
index 60ae615253..60ae615253 100644
--- a/cpp/src/qpid/messaging/SessionImpl.h
+++ b/qpid/cpp/src/qpid/messaging/SessionImpl.h
diff --git a/cpp/src/qpid/messaging/amqp/AddressHelper.cpp b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
index 8033cc5dee..8033cc5dee 100644
--- a/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
diff --git a/cpp/src/qpid/messaging/amqp/AddressHelper.h b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.h
index 3ee58cad8d..3ee58cad8d 100644
--- a/cpp/src/qpid/messaging/amqp/AddressHelper.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.h
diff --git a/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
index 1b8c848941..1b8c848941 100644
--- a/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.cpp
diff --git a/cpp/src/qpid/messaging/amqp/ConnectionContext.h b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.h
index ba3220c0ab..ba3220c0ab 100644
--- a/cpp/src/qpid/messaging/amqp/ConnectionContext.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionContext.h
diff --git a/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
index 90227fa29b..90227fa29b 100644
--- a/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
diff --git a/cpp/src/qpid/messaging/amqp/ConnectionHandle.h b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.h
index 0238313f93..0238313f93 100644
--- a/cpp/src/qpid/messaging/amqp/ConnectionHandle.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.h
diff --git a/cpp/src/qpid/messaging/amqp/DriverImpl.cpp b/qpid/cpp/src/qpid/messaging/amqp/DriverImpl.cpp
index ebe3fff1cb..ebe3fff1cb 100644
--- a/cpp/src/qpid/messaging/amqp/DriverImpl.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/DriverImpl.cpp
diff --git a/cpp/src/qpid/messaging/amqp/DriverImpl.h b/qpid/cpp/src/qpid/messaging/amqp/DriverImpl.h
index 36cb196343..36cb196343 100644
--- a/cpp/src/qpid/messaging/amqp/DriverImpl.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/DriverImpl.h
diff --git a/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
index cf60046245..cf60046245 100644
--- a/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
diff --git a/cpp/src/qpid/messaging/amqp/EncodedMessage.h b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.h
index 241118386c..241118386c 100644
--- a/cpp/src/qpid/messaging/amqp/EncodedMessage.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.h
diff --git a/cpp/src/qpid/messaging/amqp/PnData.cpp b/qpid/cpp/src/qpid/messaging/amqp/PnData.cpp
index 3309d1a683..3309d1a683 100644
--- a/cpp/src/qpid/messaging/amqp/PnData.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/PnData.cpp
diff --git a/cpp/src/qpid/messaging/amqp/PnData.h b/qpid/cpp/src/qpid/messaging/amqp/PnData.h
index b0119f88fd..b0119f88fd 100644
--- a/cpp/src/qpid/messaging/amqp/PnData.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/PnData.h
diff --git a/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp
index a28509b0b1..a28509b0b1 100644
--- a/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.cpp
diff --git a/cpp/src/qpid/messaging/amqp/ReceiverContext.h b/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h
index dd1352aecb..dd1352aecb 100644
--- a/cpp/src/qpid/messaging/amqp/ReceiverContext.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/ReceiverContext.h
diff --git a/cpp/src/qpid/messaging/amqp/ReceiverHandle.cpp b/qpid/cpp/src/qpid/messaging/amqp/ReceiverHandle.cpp
index bd7082079c..bd7082079c 100644
--- a/cpp/src/qpid/messaging/amqp/ReceiverHandle.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/ReceiverHandle.cpp
diff --git a/cpp/src/qpid/messaging/amqp/ReceiverHandle.h b/qpid/cpp/src/qpid/messaging/amqp/ReceiverHandle.h
index 08a95fb585..08a95fb585 100644
--- a/cpp/src/qpid/messaging/amqp/ReceiverHandle.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/ReceiverHandle.h
diff --git a/cpp/src/qpid/messaging/amqp/Sasl.cpp b/qpid/cpp/src/qpid/messaging/amqp/Sasl.cpp
index e1c15c2c22..e1c15c2c22 100644
--- a/cpp/src/qpid/messaging/amqp/Sasl.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/Sasl.cpp
diff --git a/cpp/src/qpid/messaging/amqp/Sasl.h b/qpid/cpp/src/qpid/messaging/amqp/Sasl.h
index a836e2e465..a836e2e465 100644
--- a/cpp/src/qpid/messaging/amqp/Sasl.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/Sasl.h
diff --git a/cpp/src/qpid/messaging/amqp/SenderContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp
index 5289fbdf9b..5289fbdf9b 100644
--- a/cpp/src/qpid/messaging/amqp/SenderContext.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/SenderContext.cpp
diff --git a/cpp/src/qpid/messaging/amqp/SenderContext.h b/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h
index 467a8e0d3d..467a8e0d3d 100644
--- a/cpp/src/qpid/messaging/amqp/SenderContext.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/SenderContext.h
diff --git a/cpp/src/qpid/messaging/amqp/SenderHandle.cpp b/qpid/cpp/src/qpid/messaging/amqp/SenderHandle.cpp
index 98f2d34e7d..98f2d34e7d 100644
--- a/cpp/src/qpid/messaging/amqp/SenderHandle.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/SenderHandle.cpp
diff --git a/cpp/src/qpid/messaging/amqp/SenderHandle.h b/qpid/cpp/src/qpid/messaging/amqp/SenderHandle.h
index fab158c1ef..fab158c1ef 100644
--- a/cpp/src/qpid/messaging/amqp/SenderHandle.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/SenderHandle.h
diff --git a/cpp/src/qpid/messaging/amqp/SessionContext.cpp b/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp
index 92bdea7dbc..92bdea7dbc 100644
--- a/cpp/src/qpid/messaging/amqp/SessionContext.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/SessionContext.cpp
diff --git a/cpp/src/qpid/messaging/amqp/SessionContext.h b/qpid/cpp/src/qpid/messaging/amqp/SessionContext.h
index 67b3c1e401..67b3c1e401 100644
--- a/cpp/src/qpid/messaging/amqp/SessionContext.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/SessionContext.h
diff --git a/cpp/src/qpid/messaging/amqp/SessionHandle.cpp b/qpid/cpp/src/qpid/messaging/amqp/SessionHandle.cpp
index 6b90d69c7f..6b90d69c7f 100644
--- a/cpp/src/qpid/messaging/amqp/SessionHandle.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/SessionHandle.cpp
diff --git a/cpp/src/qpid/messaging/amqp/SessionHandle.h b/qpid/cpp/src/qpid/messaging/amqp/SessionHandle.h
index 5e843aaacc..5e843aaacc 100644
--- a/cpp/src/qpid/messaging/amqp/SessionHandle.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/SessionHandle.h
diff --git a/cpp/src/qpid/messaging/amqp/SslTransport.cpp b/qpid/cpp/src/qpid/messaging/amqp/SslTransport.cpp
index e8ef2d587b..e8ef2d587b 100644
--- a/cpp/src/qpid/messaging/amqp/SslTransport.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/SslTransport.cpp
diff --git a/cpp/src/qpid/messaging/amqp/SslTransport.h b/qpid/cpp/src/qpid/messaging/amqp/SslTransport.h
index 2972be4fac..2972be4fac 100644
--- a/cpp/src/qpid/messaging/amqp/SslTransport.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/SslTransport.h
diff --git a/cpp/src/qpid/messaging/amqp/TcpTransport.cpp b/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.cpp
index a919e974d6..a919e974d6 100644
--- a/cpp/src/qpid/messaging/amqp/TcpTransport.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.cpp
diff --git a/cpp/src/qpid/messaging/amqp/TcpTransport.h b/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.h
index 3e59ec97b2..3e59ec97b2 100644
--- a/cpp/src/qpid/messaging/amqp/TcpTransport.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/TcpTransport.h
diff --git a/cpp/src/qpid/messaging/amqp/Transaction.cpp b/qpid/cpp/src/qpid/messaging/amqp/Transaction.cpp
index 754b00d802..754b00d802 100644
--- a/cpp/src/qpid/messaging/amqp/Transaction.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/Transaction.cpp
diff --git a/cpp/src/qpid/messaging/amqp/Transaction.h b/qpid/cpp/src/qpid/messaging/amqp/Transaction.h
index 35492c9bb3..35492c9bb3 100644
--- a/cpp/src/qpid/messaging/amqp/Transaction.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/Transaction.h
diff --git a/cpp/src/qpid/messaging/amqp/Transport.cpp b/qpid/cpp/src/qpid/messaging/amqp/Transport.cpp
index 21f51046b1..21f51046b1 100644
--- a/cpp/src/qpid/messaging/amqp/Transport.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/Transport.cpp
diff --git a/cpp/src/qpid/messaging/amqp/Transport.h b/qpid/cpp/src/qpid/messaging/amqp/Transport.h
index 6ec99ab58f..6ec99ab58f 100644
--- a/cpp/src/qpid/messaging/amqp/Transport.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/Transport.h
diff --git a/cpp/src/qpid/messaging/amqp/TransportContext.h b/qpid/cpp/src/qpid/messaging/amqp/TransportContext.h
index df9add3e0b..df9add3e0b 100644
--- a/cpp/src/qpid/messaging/amqp/TransportContext.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/TransportContext.h
diff --git a/cpp/src/qpid/messaging/amqp/util.cpp b/qpid/cpp/src/qpid/messaging/amqp/util.cpp
index 870a89e364..870a89e364 100644
--- a/cpp/src/qpid/messaging/amqp/util.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/util.cpp
diff --git a/cpp/src/qpid/messaging/amqp/util.h b/qpid/cpp/src/qpid/messaging/amqp/util.h
index d10ef406dc..d10ef406dc 100644
--- a/cpp/src/qpid/messaging/amqp/util.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/util.h
diff --git a/cpp/src/qpid/messaging/amqp/windows/SslTransport.cpp b/qpid/cpp/src/qpid/messaging/amqp/windows/SslTransport.cpp
index 5dbc13175f..5dbc13175f 100644
--- a/cpp/src/qpid/messaging/amqp/windows/SslTransport.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/windows/SslTransport.cpp
diff --git a/cpp/src/qpid/messaging/exceptions.cpp b/qpid/cpp/src/qpid/messaging/exceptions.cpp
index af8ab22251..af8ab22251 100644
--- a/cpp/src/qpid/messaging/exceptions.cpp
+++ b/qpid/cpp/src/qpid/messaging/exceptions.cpp
diff --git a/cpp/src/qpid/pointer_to_other.h b/qpid/cpp/src/qpid/pointer_to_other.h
index a99dc89658..a99dc89658 100644
--- a/cpp/src/qpid/pointer_to_other.h
+++ b/qpid/cpp/src/qpid/pointer_to_other.h
diff --git a/cpp/src/qpid/ptr_map.h b/qpid/cpp/src/qpid/ptr_map.h
index 6ffcd48e89..6ffcd48e89 100644
--- a/cpp/src/qpid/ptr_map.h
+++ b/qpid/cpp/src/qpid/ptr_map.h
diff --git a/cpp/src/qpid/store/CMakeLists.txt b/qpid/cpp/src/qpid/store/CMakeLists.txt
index ee7894730a..ee7894730a 100644
--- a/cpp/src/qpid/store/CMakeLists.txt
+++ b/qpid/cpp/src/qpid/store/CMakeLists.txt
diff --git a/cpp/src/qpid/store/MessageStorePlugin.cpp b/qpid/cpp/src/qpid/store/MessageStorePlugin.cpp
index b876bd6b6d..b876bd6b6d 100644
--- a/cpp/src/qpid/store/MessageStorePlugin.cpp
+++ b/qpid/cpp/src/qpid/store/MessageStorePlugin.cpp
diff --git a/cpp/src/qpid/store/MessageStorePlugin.h b/qpid/cpp/src/qpid/store/MessageStorePlugin.h
index 5290fc16db..5290fc16db 100644
--- a/cpp/src/qpid/store/MessageStorePlugin.h
+++ b/qpid/cpp/src/qpid/store/MessageStorePlugin.h
diff --git a/cpp/src/qpid/store/StorageProvider.h b/qpid/cpp/src/qpid/store/StorageProvider.h
index de12ffb869..de12ffb869 100644
--- a/cpp/src/qpid/store/StorageProvider.h
+++ b/qpid/cpp/src/qpid/store/StorageProvider.h
diff --git a/cpp/src/qpid/store/StoreException.h b/qpid/cpp/src/qpid/store/StoreException.h
index 1dc7f670ec..1dc7f670ec 100644
--- a/cpp/src/qpid/store/StoreException.h
+++ b/qpid/cpp/src/qpid/store/StoreException.h
diff --git a/cpp/src/qpid/store/ms-clfs/Log.cpp b/qpid/cpp/src/qpid/store/ms-clfs/Log.cpp
index e6cb10c133..e6cb10c133 100644
--- a/cpp/src/qpid/store/ms-clfs/Log.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Log.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/Log.h b/qpid/cpp/src/qpid/store/ms-clfs/Log.h
index 2f7eb6cada..2f7eb6cada 100644
--- a/cpp/src/qpid/store/ms-clfs/Log.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Log.h
diff --git a/cpp/src/qpid/store/ms-clfs/Lsn.h b/qpid/cpp/src/qpid/store/ms-clfs/Lsn.h
index 7f46c1f266..7f46c1f266 100644
--- a/cpp/src/qpid/store/ms-clfs/Lsn.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Lsn.h
diff --git a/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp b/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
index 5ff24e7d33..5ff24e7d33 100644
--- a/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/MessageLog.cpp b/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.cpp
index 849a0a44e8..849a0a44e8 100644
--- a/cpp/src/qpid/store/ms-clfs/MessageLog.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/MessageLog.h b/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.h
index b3705287a6..b3705287a6 100644
--- a/cpp/src/qpid/store/ms-clfs/MessageLog.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/MessageLog.h
diff --git a/cpp/src/qpid/store/ms-clfs/Messages.cpp b/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
index db5d2ebf4c..db5d2ebf4c 100644
--- a/cpp/src/qpid/store/ms-clfs/Messages.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Messages.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/Messages.h b/qpid/cpp/src/qpid/store/ms-clfs/Messages.h
index 93cc8bfe62..93cc8bfe62 100644
--- a/cpp/src/qpid/store/ms-clfs/Messages.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Messages.h
diff --git a/cpp/src/qpid/store/ms-clfs/Transaction.cpp b/qpid/cpp/src/qpid/store/ms-clfs/Transaction.cpp
index f94fef6f84..f94fef6f84 100644
--- a/cpp/src/qpid/store/ms-clfs/Transaction.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Transaction.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/Transaction.h b/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h
index 499b01d503..499b01d503 100644
--- a/cpp/src/qpid/store/ms-clfs/Transaction.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/Transaction.h
diff --git a/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp b/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp
index 0ef046d7c8..0ef046d7c8 100644
--- a/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.cpp
diff --git a/cpp/src/qpid/store/ms-clfs/TransactionLog.h b/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.h
index 7ca27c229e..7ca27c229e 100644
--- a/cpp/src/qpid/store/ms-clfs/TransactionLog.h
+++ b/qpid/cpp/src/qpid/store/ms-clfs/TransactionLog.h
diff --git a/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp b/qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp
index 095d1bf331..095d1bf331 100644
--- a/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.cpp
diff --git a/cpp/src/qpid/store/ms-sql/AmqpTransaction.h b/qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.h
index 625fab5595..625fab5595 100644
--- a/cpp/src/qpid/store/ms-sql/AmqpTransaction.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/AmqpTransaction.h
diff --git a/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp
index 1dc4370312..1dc4370312 100644
--- a/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BindingRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.h
index 3cb732de75..3cb732de75 100644
--- a/cpp/src/qpid/store/ms-sql/BindingRecordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/BindingRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp b/qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp
index 1889f34e41..1889f34e41 100644
--- a/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BlobAdapter.h b/qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.h
index 1c666392bc..1c666392bc 100644
--- a/cpp/src/qpid/store/ms-sql/BlobAdapter.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobAdapter.h
diff --git a/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp b/qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp
index 75d3dc2d86..75d3dc2d86 100644
--- a/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BlobEncoder.h b/qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.h
index d2b56223c1..d2b56223c1 100644
--- a/cpp/src/qpid/store/ms-sql/BlobEncoder.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobEncoder.h
diff --git a/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp
index ef1757dbad..ef1757dbad 100644
--- a/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/BlobRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.h
index 4d1c338746..4d1c338746 100644
--- a/cpp/src/qpid/store/ms-sql/BlobRecordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/BlobRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp b/qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp
index 3219ea526a..3219ea526a 100644
--- a/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.cpp
diff --git a/cpp/src/qpid/store/ms-sql/DatabaseConnection.h b/qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.h
index 785d1587c5..785d1587c5 100644
--- a/cpp/src/qpid/store/ms-sql/DatabaseConnection.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/DatabaseConnection.h
diff --git a/cpp/src/qpid/store/ms-sql/Exception.h b/qpid/cpp/src/qpid/store/ms-sql/Exception.h
index 65ec3388ff..65ec3388ff 100644
--- a/cpp/src/qpid/store/ms-sql/Exception.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/Exception.h
diff --git a/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp b/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
index 1432cc8fca..1432cc8fca 100644
--- a/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
diff --git a/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp
index ce9fa61010..ce9fa61010 100644
--- a/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h
index 1b0c2f073e..1b0c2f073e 100644
--- a/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/MessageMapRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
index 495f1a08c2..495f1a08c2 100644
--- a/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/MessageRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.h
index 698b2561fe..698b2561fe 100644
--- a/cpp/src/qpid/store/ms-sql/MessageRecordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/MessageRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/Recordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/Recordset.cpp
index e706799951..e706799951 100644
--- a/cpp/src/qpid/store/ms-sql/Recordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/Recordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/Recordset.h b/qpid/cpp/src/qpid/store/ms-sql/Recordset.h
index 032b2bd434..032b2bd434 100644
--- a/cpp/src/qpid/store/ms-sql/Recordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/Recordset.h
diff --git a/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp b/qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp
index 6ad7725570..6ad7725570 100644
--- a/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.cpp
diff --git a/cpp/src/qpid/store/ms-sql/SqlTransaction.h b/qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.h
index 8b5239b786..8b5239b786 100644
--- a/cpp/src/qpid/store/ms-sql/SqlTransaction.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/SqlTransaction.h
diff --git a/cpp/src/qpid/store/ms-sql/State.cpp b/qpid/cpp/src/qpid/store/ms-sql/State.cpp
index 720603dd11..720603dd11 100644
--- a/cpp/src/qpid/store/ms-sql/State.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/State.cpp
diff --git a/cpp/src/qpid/store/ms-sql/State.h b/qpid/cpp/src/qpid/store/ms-sql/State.h
index 6350bc5bd2..6350bc5bd2 100644
--- a/cpp/src/qpid/store/ms-sql/State.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/State.h
diff --git a/cpp/src/qpid/store/ms-sql/TplRecordset.cpp b/qpid/cpp/src/qpid/store/ms-sql/TplRecordset.cpp
index 1309d921a9..1309d921a9 100644
--- a/cpp/src/qpid/store/ms-sql/TplRecordset.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/TplRecordset.cpp
diff --git a/cpp/src/qpid/store/ms-sql/TplRecordset.h b/qpid/cpp/src/qpid/store/ms-sql/TplRecordset.h
index fbde51738c..fbde51738c 100644
--- a/cpp/src/qpid/store/ms-sql/TplRecordset.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/TplRecordset.h
diff --git a/cpp/src/qpid/store/ms-sql/VariantHelper.cpp b/qpid/cpp/src/qpid/store/ms-sql/VariantHelper.cpp
index acec95c1f9..acec95c1f9 100644
--- a/cpp/src/qpid/store/ms-sql/VariantHelper.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/VariantHelper.cpp
diff --git a/cpp/src/qpid/store/ms-sql/VariantHelper.h b/qpid/cpp/src/qpid/store/ms-sql/VariantHelper.h
index 723dbc3b76..723dbc3b76 100644
--- a/cpp/src/qpid/store/ms-sql/VariantHelper.h
+++ b/qpid/cpp/src/qpid/store/ms-sql/VariantHelper.h
diff --git a/cpp/src/qpid/sys/AggregateOutput.cpp b/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
index 773ea68e55..773ea68e55 100644
--- a/cpp/src/qpid/sys/AggregateOutput.cpp
+++ b/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
diff --git a/cpp/src/qpid/sys/AggregateOutput.h b/qpid/cpp/src/qpid/sys/AggregateOutput.h
index c8dd8d989a..c8dd8d989a 100644
--- a/cpp/src/qpid/sys/AggregateOutput.h
+++ b/qpid/cpp/src/qpid/sys/AggregateOutput.h
diff --git a/cpp/src/qpid/sys/AsynchIO.h b/qpid/cpp/src/qpid/sys/AsynchIO.h
index 09402e9e44..09402e9e44 100644
--- a/cpp/src/qpid/sys/AsynchIO.h
+++ b/qpid/cpp/src/qpid/sys/AsynchIO.h
diff --git a/cpp/src/qpid/sys/AsynchIOHandler.cpp b/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
index 2037ba38ab..2037ba38ab 100644
--- a/cpp/src/qpid/sys/AsynchIOHandler.cpp
+++ b/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
diff --git a/cpp/src/qpid/sys/AsynchIOHandler.h b/qpid/cpp/src/qpid/sys/AsynchIOHandler.h
index 698ac5fc9c..698ac5fc9c 100644
--- a/cpp/src/qpid/sys/AsynchIOHandler.h
+++ b/qpid/cpp/src/qpid/sys/AsynchIOHandler.h
diff --git a/cpp/src/qpid/sys/AtomicCount.h b/qpid/cpp/src/qpid/sys/AtomicCount.h
index 94580c61f3..94580c61f3 100644
--- a/cpp/src/qpid/sys/AtomicCount.h
+++ b/qpid/cpp/src/qpid/sys/AtomicCount.h
diff --git a/cpp/src/qpid/sys/AtomicValue.h b/qpid/cpp/src/qpid/sys/AtomicValue.h
index bf995f991e..bf995f991e 100644
--- a/cpp/src/qpid/sys/AtomicValue.h
+++ b/qpid/cpp/src/qpid/sys/AtomicValue.h
diff --git a/cpp/src/qpid/sys/AtomicValue_gcc.h b/qpid/cpp/src/qpid/sys/AtomicValue_gcc.h
index 724bae422e..724bae422e 100644
--- a/cpp/src/qpid/sys/AtomicValue_gcc.h
+++ b/qpid/cpp/src/qpid/sys/AtomicValue_gcc.h
diff --git a/cpp/src/qpid/sys/AtomicValue_mutex.h b/qpid/cpp/src/qpid/sys/AtomicValue_mutex.h
index e4d433e7f5..e4d433e7f5 100644
--- a/cpp/src/qpid/sys/AtomicValue_mutex.h
+++ b/qpid/cpp/src/qpid/sys/AtomicValue_mutex.h
diff --git a/cpp/src/qpid/sys/BlockingQueue.h b/qpid/cpp/src/qpid/sys/BlockingQueue.h
index ca6b529930..ca6b529930 100644
--- a/cpp/src/qpid/sys/BlockingQueue.h
+++ b/qpid/cpp/src/qpid/sys/BlockingQueue.h
diff --git a/cpp/src/qpid/sys/Codec.h b/qpid/cpp/src/qpid/sys/Codec.h
index e398403e47..e398403e47 100644
--- a/cpp/src/qpid/sys/Codec.h
+++ b/qpid/cpp/src/qpid/sys/Codec.h
diff --git a/cpp/src/qpid/sys/Condition.h b/qpid/cpp/src/qpid/sys/Condition.h
index 9be4b357fe..9be4b357fe 100644
--- a/cpp/src/qpid/sys/Condition.h
+++ b/qpid/cpp/src/qpid/sys/Condition.h
diff --git a/cpp/src/qpid/sys/ConnectionCodec.h b/qpid/cpp/src/qpid/sys/ConnectionCodec.h
index 8b5b69cdb4..8b5b69cdb4 100644
--- a/cpp/src/qpid/sys/ConnectionCodec.h
+++ b/qpid/cpp/src/qpid/sys/ConnectionCodec.h
diff --git a/cpp/src/qpid/sys/ConnectionInputHandler.h b/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h
index f6fcdb7479..f6fcdb7479 100644
--- a/cpp/src/qpid/sys/ConnectionInputHandler.h
+++ b/qpid/cpp/src/qpid/sys/ConnectionInputHandler.h
diff --git a/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h b/qpid/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
index 9bb7e13686..9bb7e13686 100644
--- a/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
+++ b/qpid/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandler.h b/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
index 3b1440d613..3b1440d613 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandler.h
+++ b/qpid/cpp/src/qpid/sys/ConnectionOutputHandler.h
diff --git a/cpp/src/qpid/sys/CopyOnWriteArray.h b/qpid/cpp/src/qpid/sys/CopyOnWriteArray.h
index 41384fc5a4..41384fc5a4 100644
--- a/cpp/src/qpid/sys/CopyOnWriteArray.h
+++ b/qpid/cpp/src/qpid/sys/CopyOnWriteArray.h
diff --git a/cpp/src/qpid/sys/DeletionManager.h b/qpid/cpp/src/qpid/sys/DeletionManager.h
index c1fea19f30..c1fea19f30 100644
--- a/cpp/src/qpid/sys/DeletionManager.h
+++ b/qpid/cpp/src/qpid/sys/DeletionManager.h
diff --git a/cpp/src/qpid/sys/DispatchHandle.cpp b/qpid/cpp/src/qpid/sys/DispatchHandle.cpp
index 5d6fc4e72f..5d6fc4e72f 100644
--- a/cpp/src/qpid/sys/DispatchHandle.cpp
+++ b/qpid/cpp/src/qpid/sys/DispatchHandle.cpp
diff --git a/cpp/src/qpid/sys/DispatchHandle.h b/qpid/cpp/src/qpid/sys/DispatchHandle.h
index 115a3c44f7..115a3c44f7 100644
--- a/cpp/src/qpid/sys/DispatchHandle.h
+++ b/qpid/cpp/src/qpid/sys/DispatchHandle.h
diff --git a/cpp/src/qpid/sys/Dispatcher.cpp b/qpid/cpp/src/qpid/sys/Dispatcher.cpp
index 5f52dcd990..5f52dcd990 100644
--- a/cpp/src/qpid/sys/Dispatcher.cpp
+++ b/qpid/cpp/src/qpid/sys/Dispatcher.cpp
diff --git a/cpp/src/qpid/sys/Dispatcher.h b/qpid/cpp/src/qpid/sys/Dispatcher.h
index e8213d0579..e8213d0579 100644
--- a/cpp/src/qpid/sys/Dispatcher.h
+++ b/qpid/cpp/src/qpid/sys/Dispatcher.h
diff --git a/cpp/src/qpid/sys/ExceptionHolder.h b/qpid/cpp/src/qpid/sys/ExceptionHolder.h
index 4bc934cf75..4bc934cf75 100644
--- a/cpp/src/qpid/sys/ExceptionHolder.h
+++ b/qpid/cpp/src/qpid/sys/ExceptionHolder.h
diff --git a/cpp/src/qpid/sys/FileSysDir.h b/qpid/cpp/src/qpid/sys/FileSysDir.h
index 7432fe39c9..7432fe39c9 100755
--- a/cpp/src/qpid/sys/FileSysDir.h
+++ b/qpid/cpp/src/qpid/sys/FileSysDir.h
diff --git a/cpp/src/qpid/sys/Fork.h b/qpid/cpp/src/qpid/sys/Fork.h
index 4ec061f7bc..4ec061f7bc 100644
--- a/cpp/src/qpid/sys/Fork.h
+++ b/qpid/cpp/src/qpid/sys/Fork.h
diff --git a/cpp/src/qpid/sys/FreeBSD/uuid.cpp b/qpid/cpp/src/qpid/sys/FreeBSD/uuid.cpp
index 076056b2af..076056b2af 100644
--- a/cpp/src/qpid/sys/FreeBSD/uuid.cpp
+++ b/qpid/cpp/src/qpid/sys/FreeBSD/uuid.cpp
diff --git a/cpp/src/qpid/sys/IOHandle.h b/qpid/cpp/src/qpid/sys/IOHandle.h
index 06ae65f879..06ae65f879 100644
--- a/cpp/src/qpid/sys/IOHandle.h
+++ b/qpid/cpp/src/qpid/sys/IOHandle.h
diff --git a/cpp/src/qpid/sys/LockFile.h b/qpid/cpp/src/qpid/sys/LockFile.h
index 14a76cbf3e..14a76cbf3e 100644
--- a/cpp/src/qpid/sys/LockFile.h
+++ b/qpid/cpp/src/qpid/sys/LockFile.h
diff --git a/cpp/src/qpid/sys/LockPtr.h b/qpid/cpp/src/qpid/sys/LockPtr.h
index 738a864317..738a864317 100644
--- a/cpp/src/qpid/sys/LockPtr.h
+++ b/qpid/cpp/src/qpid/sys/LockPtr.h
diff --git a/cpp/src/qpid/sys/MemStat.cpp b/qpid/cpp/src/qpid/sys/MemStat.cpp
index c71fba785c..c71fba785c 100644
--- a/cpp/src/qpid/sys/MemStat.cpp
+++ b/qpid/cpp/src/qpid/sys/MemStat.cpp
diff --git a/cpp/src/qpid/sys/MemStat.h b/qpid/cpp/src/qpid/sys/MemStat.h
index d855786cd5..d855786cd5 100644
--- a/cpp/src/qpid/sys/MemStat.h
+++ b/qpid/cpp/src/qpid/sys/MemStat.h
diff --git a/cpp/src/qpid/sys/MemoryMappedFile.h b/qpid/cpp/src/qpid/sys/MemoryMappedFile.h
index ecf38e98e6..ecf38e98e6 100644
--- a/cpp/src/qpid/sys/MemoryMappedFile.h
+++ b/qpid/cpp/src/qpid/sys/MemoryMappedFile.h
diff --git a/cpp/src/qpid/sys/Monitor.h b/qpid/cpp/src/qpid/sys/Monitor.h
index 123bf92dcb..123bf92dcb 100644
--- a/cpp/src/qpid/sys/Monitor.h
+++ b/qpid/cpp/src/qpid/sys/Monitor.h
diff --git a/cpp/src/qpid/sys/Mutex.h b/qpid/cpp/src/qpid/sys/Mutex.h
index e718586a39..e718586a39 100644
--- a/cpp/src/qpid/sys/Mutex.h
+++ b/qpid/cpp/src/qpid/sys/Mutex.h
diff --git a/cpp/src/qpid/sys/OutputControl.h b/qpid/cpp/src/qpid/sys/OutputControl.h
index f990594637..f990594637 100644
--- a/cpp/src/qpid/sys/OutputControl.h
+++ b/qpid/cpp/src/qpid/sys/OutputControl.h
diff --git a/cpp/src/qpid/sys/OutputTask.h b/qpid/cpp/src/qpid/sys/OutputTask.h
index fb08a63cd0..fb08a63cd0 100644
--- a/cpp/src/qpid/sys/OutputTask.h
+++ b/qpid/cpp/src/qpid/sys/OutputTask.h
diff --git a/cpp/src/qpid/sys/Path.h b/qpid/cpp/src/qpid/sys/Path.h
index 9b440b3c00..9b440b3c00 100644
--- a/cpp/src/qpid/sys/Path.h
+++ b/qpid/cpp/src/qpid/sys/Path.h
diff --git a/cpp/src/qpid/sys/PipeHandle.h b/qpid/cpp/src/qpid/sys/PipeHandle.h
index 8aac76996b..8aac76996b 100755
--- a/cpp/src/qpid/sys/PipeHandle.h
+++ b/qpid/cpp/src/qpid/sys/PipeHandle.h
diff --git a/cpp/src/qpid/sys/PollableCondition.h b/qpid/cpp/src/qpid/sys/PollableCondition.h
index 2eb6f2d947..2eb6f2d947 100644
--- a/cpp/src/qpid/sys/PollableCondition.h
+++ b/qpid/cpp/src/qpid/sys/PollableCondition.h
diff --git a/cpp/src/qpid/sys/PollableQueue.h b/qpid/cpp/src/qpid/sys/PollableQueue.h
index 5a3e281e9f..5a3e281e9f 100644
--- a/cpp/src/qpid/sys/PollableQueue.h
+++ b/qpid/cpp/src/qpid/sys/PollableQueue.h
diff --git a/cpp/src/qpid/sys/Poller.h b/qpid/cpp/src/qpid/sys/Poller.h
index 01ee139ee6..01ee139ee6 100644
--- a/cpp/src/qpid/sys/Poller.h
+++ b/qpid/cpp/src/qpid/sys/Poller.h
diff --git a/cpp/src/qpid/sys/Probes.h b/qpid/cpp/src/qpid/sys/Probes.h
index d30181c357..d30181c357 100644
--- a/cpp/src/qpid/sys/Probes.h
+++ b/qpid/cpp/src/qpid/sys/Probes.h
diff --git a/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
index 9a7b8ef201..9a7b8ef201 100644
--- a/cpp/src/qpid/sys/RdmaIOPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
diff --git a/cpp/src/qpid/sys/Runnable.cpp b/qpid/cpp/src/qpid/sys/Runnable.cpp
index 325d87c91b..325d87c91b 100644
--- a/cpp/src/qpid/sys/Runnable.cpp
+++ b/qpid/cpp/src/qpid/sys/Runnable.cpp
diff --git a/cpp/src/qpid/sys/Runnable.h b/qpid/cpp/src/qpid/sys/Runnable.h
index fed7663cb6..fed7663cb6 100644
--- a/cpp/src/qpid/sys/Runnable.h
+++ b/qpid/cpp/src/qpid/sys/Runnable.h
diff --git a/cpp/src/qpid/sys/ScopedIncrement.h b/qpid/cpp/src/qpid/sys/ScopedIncrement.h
index 8645ab2484..8645ab2484 100644
--- a/cpp/src/qpid/sys/ScopedIncrement.h
+++ b/qpid/cpp/src/qpid/sys/ScopedIncrement.h
diff --git a/cpp/src/qpid/sys/SecurityLayer.h b/qpid/cpp/src/qpid/sys/SecurityLayer.h
index 317ada16de..317ada16de 100644
--- a/cpp/src/qpid/sys/SecurityLayer.h
+++ b/qpid/cpp/src/qpid/sys/SecurityLayer.h
diff --git a/cpp/src/qpid/sys/SecuritySettings.h b/qpid/cpp/src/qpid/sys/SecuritySettings.h
index d595cad660..d595cad660 100644
--- a/cpp/src/qpid/sys/SecuritySettings.h
+++ b/qpid/cpp/src/qpid/sys/SecuritySettings.h
diff --git a/cpp/src/qpid/sys/Semaphore.h b/qpid/cpp/src/qpid/sys/Semaphore.h
index 9d70f89aeb..9d70f89aeb 100644
--- a/cpp/src/qpid/sys/Semaphore.h
+++ b/qpid/cpp/src/qpid/sys/Semaphore.h
diff --git a/cpp/src/qpid/sys/Shlib.cpp b/qpid/cpp/src/qpid/sys/Shlib.cpp
index 342d726876..342d726876 100644
--- a/cpp/src/qpid/sys/Shlib.cpp
+++ b/qpid/cpp/src/qpid/sys/Shlib.cpp
diff --git a/cpp/src/qpid/sys/Shlib.h b/qpid/cpp/src/qpid/sys/Shlib.h
index 2ce5a49fcb..2ce5a49fcb 100644
--- a/cpp/src/qpid/sys/Shlib.h
+++ b/qpid/cpp/src/qpid/sys/Shlib.h
diff --git a/cpp/src/qpid/sys/ShutdownHandler.h b/qpid/cpp/src/qpid/sys/ShutdownHandler.h
index 88baecb5b6..88baecb5b6 100644
--- a/cpp/src/qpid/sys/ShutdownHandler.h
+++ b/qpid/cpp/src/qpid/sys/ShutdownHandler.h
diff --git a/cpp/src/qpid/sys/Socket.h b/qpid/cpp/src/qpid/sys/Socket.h
index 38183bd5fd..38183bd5fd 100644
--- a/cpp/src/qpid/sys/Socket.h
+++ b/qpid/cpp/src/qpid/sys/Socket.h
diff --git a/cpp/src/qpid/sys/SocketAddress.h b/qpid/cpp/src/qpid/sys/SocketAddress.h
index 00b05f4c6c..00b05f4c6c 100644
--- a/cpp/src/qpid/sys/SocketAddress.h
+++ b/qpid/cpp/src/qpid/sys/SocketAddress.h
diff --git a/cpp/src/qpid/sys/SocketTransport.cpp b/qpid/cpp/src/qpid/sys/SocketTransport.cpp
index 86c9d301e9..86c9d301e9 100644
--- a/cpp/src/qpid/sys/SocketTransport.cpp
+++ b/qpid/cpp/src/qpid/sys/SocketTransport.cpp
diff --git a/cpp/src/qpid/sys/SocketTransport.h b/qpid/cpp/src/qpid/sys/SocketTransport.h
index 5aca52c372..5aca52c372 100644
--- a/cpp/src/qpid/sys/SocketTransport.h
+++ b/qpid/cpp/src/qpid/sys/SocketTransport.h
diff --git a/cpp/src/qpid/sys/SslPlugin.cpp b/qpid/cpp/src/qpid/sys/SslPlugin.cpp
index 0ec31b1e47..0ec31b1e47 100644
--- a/cpp/src/qpid/sys/SslPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/SslPlugin.cpp
diff --git a/cpp/src/qpid/sys/StateMonitor.h b/qpid/cpp/src/qpid/sys/StateMonitor.h
index eac37a8543..eac37a8543 100644
--- a/cpp/src/qpid/sys/StateMonitor.h
+++ b/qpid/cpp/src/qpid/sys/StateMonitor.h
diff --git a/cpp/src/qpid/sys/StrError.h b/qpid/cpp/src/qpid/sys/StrError.h
index 36489dd0fc..36489dd0fc 100644
--- a/cpp/src/qpid/sys/StrError.h
+++ b/qpid/cpp/src/qpid/sys/StrError.h
diff --git a/cpp/src/qpid/sys/SystemInfo.h b/qpid/cpp/src/qpid/sys/SystemInfo.h
index 1b5720a5f0..1b5720a5f0 100644
--- a/cpp/src/qpid/sys/SystemInfo.h
+++ b/qpid/cpp/src/qpid/sys/SystemInfo.h
diff --git a/cpp/src/qpid/sys/TCPIOPlugin.cpp b/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
index 9e240ad7e3..9e240ad7e3 100644
--- a/cpp/src/qpid/sys/TCPIOPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/TCPIOPlugin.cpp
diff --git a/cpp/src/qpid/sys/Thread.h b/qpid/cpp/src/qpid/sys/Thread.h
index cb0a1adce6..cb0a1adce6 100644
--- a/cpp/src/qpid/sys/Thread.h
+++ b/qpid/cpp/src/qpid/sys/Thread.h
diff --git a/cpp/src/qpid/sys/Time.h b/qpid/cpp/src/qpid/sys/Time.h
index 8a82b5f826..8a82b5f826 100644
--- a/cpp/src/qpid/sys/Time.h
+++ b/qpid/cpp/src/qpid/sys/Time.h
diff --git a/cpp/src/qpid/sys/Timer.cpp b/qpid/cpp/src/qpid/sys/Timer.cpp
index f8eef2c9ec..f8eef2c9ec 100644
--- a/cpp/src/qpid/sys/Timer.cpp
+++ b/qpid/cpp/src/qpid/sys/Timer.cpp
diff --git a/cpp/src/qpid/sys/Timer.h b/qpid/cpp/src/qpid/sys/Timer.h
index 6281e08913..6281e08913 100644
--- a/cpp/src/qpid/sys/Timer.h
+++ b/qpid/cpp/src/qpid/sys/Timer.h
diff --git a/cpp/src/qpid/sys/TimerWarnings.cpp b/qpid/cpp/src/qpid/sys/TimerWarnings.cpp
index 00fb0d9db6..00fb0d9db6 100644
--- a/cpp/src/qpid/sys/TimerWarnings.cpp
+++ b/qpid/cpp/src/qpid/sys/TimerWarnings.cpp
diff --git a/cpp/src/qpid/sys/TimerWarnings.h b/qpid/cpp/src/qpid/sys/TimerWarnings.h
index 337a434ab5..337a434ab5 100644
--- a/cpp/src/qpid/sys/TimerWarnings.h
+++ b/qpid/cpp/src/qpid/sys/TimerWarnings.h
diff --git a/cpp/src/qpid/sys/TransportFactory.h b/qpid/cpp/src/qpid/sys/TransportFactory.h
index 06aa168024..06aa168024 100644
--- a/cpp/src/qpid/sys/TransportFactory.h
+++ b/qpid/cpp/src/qpid/sys/TransportFactory.h
diff --git a/cpp/src/qpid/sys/Waitable.h b/qpid/cpp/src/qpid/sys/Waitable.h
index 56f71023c5..56f71023c5 100644
--- a/cpp/src/qpid/sys/Waitable.h
+++ b/qpid/cpp/src/qpid/sys/Waitable.h
diff --git a/cpp/src/qpid/sys/aix/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp
index d28d9b7b37..d28d9b7b37 100644
--- a/cpp/src/qpid/sys/aix/SystemInfo.cpp
+++ b/qpid/cpp/src/qpid/sys/aix/SystemInfo.cpp
diff --git a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
index 79d9d08a59..79d9d08a59 100644
--- a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
+++ b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
diff --git a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h
index ae86ba5569..ae86ba5569 100644
--- a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h
+++ b/qpid/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.h
diff --git a/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
index 6fdf99637f..6fdf99637f 100644
--- a/cpp/src/qpid/sys/epoll/EpollPoller.cpp
+++ b/qpid/cpp/src/qpid/sys/epoll/EpollPoller.cpp
diff --git a/cpp/src/qpid/sys/posix/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
index 7d04d2214d..7d04d2214d 100644
--- a/cpp/src/qpid/sys/posix/AsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/AsynchIO.cpp
diff --git a/cpp/src/qpid/sys/posix/BSDSocket.cpp b/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp
index 7c31b13ae9..7c31b13ae9 100644
--- a/cpp/src/qpid/sys/posix/BSDSocket.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/BSDSocket.cpp
diff --git a/cpp/src/qpid/sys/posix/BSDSocket.h b/qpid/cpp/src/qpid/sys/posix/BSDSocket.h
index ae73718d55..ae73718d55 100644
--- a/cpp/src/qpid/sys/posix/BSDSocket.h
+++ b/qpid/cpp/src/qpid/sys/posix/BSDSocket.h
diff --git a/cpp/src/qpid/sys/posix/Condition.cpp b/qpid/cpp/src/qpid/sys/posix/Condition.cpp
index f629e50cd7..f629e50cd7 100644
--- a/cpp/src/qpid/sys/posix/Condition.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Condition.cpp
diff --git a/cpp/src/qpid/sys/posix/Condition.h b/qpid/cpp/src/qpid/sys/posix/Condition.h
index 66f95d5fc8..66f95d5fc8 100644
--- a/cpp/src/qpid/sys/posix/Condition.h
+++ b/qpid/cpp/src/qpid/sys/posix/Condition.h
diff --git a/cpp/src/qpid/sys/posix/FileSysDir.cpp b/qpid/cpp/src/qpid/sys/posix/FileSysDir.cpp
index cec580164d..cec580164d 100755
--- a/cpp/src/qpid/sys/posix/FileSysDir.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/FileSysDir.cpp
diff --git a/cpp/src/qpid/sys/posix/Fork.cpp b/qpid/cpp/src/qpid/sys/posix/Fork.cpp
index a0d404a16e..a0d404a16e 100644
--- a/cpp/src/qpid/sys/posix/Fork.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Fork.cpp
diff --git a/cpp/src/qpid/sys/posix/Fork.h b/qpid/cpp/src/qpid/sys/posix/Fork.h
index 698c61ed30..698c61ed30 100644
--- a/cpp/src/qpid/sys/posix/Fork.h
+++ b/qpid/cpp/src/qpid/sys/posix/Fork.h
diff --git a/cpp/src/qpid/sys/posix/IOHandle.cpp b/qpid/cpp/src/qpid/sys/posix/IOHandle.cpp
index d3f502a63c..d3f502a63c 100644
--- a/cpp/src/qpid/sys/posix/IOHandle.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/IOHandle.cpp
diff --git a/cpp/src/qpid/sys/posix/LockFile.cpp b/qpid/cpp/src/qpid/sys/posix/LockFile.cpp
index 9fdf83f1bd..9fdf83f1bd 100755
--- a/cpp/src/qpid/sys/posix/LockFile.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/LockFile.cpp
diff --git a/cpp/src/qpid/sys/posix/MemStat.cpp b/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
index 2fbf119cab..2fbf119cab 100644
--- a/cpp/src/qpid/sys/posix/MemStat.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/MemStat.cpp
diff --git a/cpp/src/qpid/sys/posix/MemoryMappedFile.cpp b/qpid/cpp/src/qpid/sys/posix/MemoryMappedFile.cpp
index b4292aa4bc..b4292aa4bc 100644
--- a/cpp/src/qpid/sys/posix/MemoryMappedFile.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/MemoryMappedFile.cpp
diff --git a/cpp/src/qpid/sys/posix/Mutex.cpp b/qpid/cpp/src/qpid/sys/posix/Mutex.cpp
index 0e1f0d30c2..0e1f0d30c2 100644
--- a/cpp/src/qpid/sys/posix/Mutex.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Mutex.cpp
diff --git a/cpp/src/qpid/sys/posix/Mutex.h b/qpid/cpp/src/qpid/sys/posix/Mutex.h
index e2b21b5a56..e2b21b5a56 100644
--- a/cpp/src/qpid/sys/posix/Mutex.h
+++ b/qpid/cpp/src/qpid/sys/posix/Mutex.h
diff --git a/cpp/src/qpid/sys/posix/Path.cpp b/qpid/cpp/src/qpid/sys/posix/Path.cpp
index 063e3cfc51..063e3cfc51 100644
--- a/cpp/src/qpid/sys/posix/Path.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Path.cpp
diff --git a/cpp/src/qpid/sys/posix/PidFile.h b/qpid/cpp/src/qpid/sys/posix/PidFile.h
index fb19d407f4..fb19d407f4 100644
--- a/cpp/src/qpid/sys/posix/PidFile.h
+++ b/qpid/cpp/src/qpid/sys/posix/PidFile.h
diff --git a/cpp/src/qpid/sys/posix/PipeHandle.cpp b/qpid/cpp/src/qpid/sys/posix/PipeHandle.cpp
index 4b19783338..4b19783338 100755
--- a/cpp/src/qpid/sys/posix/PipeHandle.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/PipeHandle.cpp
diff --git a/cpp/src/qpid/sys/posix/PollableCondition.cpp b/qpid/cpp/src/qpid/sys/posix/PollableCondition.cpp
index aa129faf20..aa129faf20 100644
--- a/cpp/src/qpid/sys/posix/PollableCondition.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/PollableCondition.cpp
diff --git a/cpp/src/qpid/sys/posix/PosixPoller.cpp b/qpid/cpp/src/qpid/sys/posix/PosixPoller.cpp
index ae839b2e20..ae839b2e20 100644
--- a/cpp/src/qpid/sys/posix/PosixPoller.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/PosixPoller.cpp
diff --git a/cpp/src/qpid/sys/posix/PrivatePosix.h b/qpid/cpp/src/qpid/sys/posix/PrivatePosix.h
index 34a2022694..34a2022694 100644
--- a/cpp/src/qpid/sys/posix/PrivatePosix.h
+++ b/qpid/cpp/src/qpid/sys/posix/PrivatePosix.h
diff --git a/cpp/src/qpid/sys/posix/Shlib.cpp b/qpid/cpp/src/qpid/sys/posix/Shlib.cpp
index 3fb685d5b8..3fb685d5b8 100644
--- a/cpp/src/qpid/sys/posix/Shlib.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Shlib.cpp
diff --git a/cpp/src/qpid/sys/posix/SocketAddress.cpp b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
index 4c860a7ef7..4c860a7ef7 100644
--- a/cpp/src/qpid/sys/posix/SocketAddress.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
diff --git a/cpp/src/qpid/sys/posix/StrError.cpp b/qpid/cpp/src/qpid/sys/posix/StrError.cpp
index 633e20213c..633e20213c 100644
--- a/cpp/src/qpid/sys/posix/StrError.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/StrError.cpp
diff --git a/cpp/src/qpid/sys/posix/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
index 2a42a5b2a7..2a42a5b2a7 100755
--- a/cpp/src/qpid/sys/posix/SystemInfo.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
diff --git a/cpp/src/qpid/sys/posix/Thread.cpp b/qpid/cpp/src/qpid/sys/posix/Thread.cpp
index 349e35d643..349e35d643 100644
--- a/cpp/src/qpid/sys/posix/Thread.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Thread.cpp
diff --git a/cpp/src/qpid/sys/posix/Time.cpp b/qpid/cpp/src/qpid/sys/posix/Time.cpp
index 10a5d944b1..10a5d944b1 100644
--- a/cpp/src/qpid/sys/posix/Time.cpp
+++ b/qpid/cpp/src/qpid/sys/posix/Time.cpp
diff --git a/cpp/src/qpid/sys/posix/Time.h b/qpid/cpp/src/qpid/sys/posix/Time.h
index 62d734c816..62d734c816 100755
--- a/cpp/src/qpid/sys/posix/Time.h
+++ b/qpid/cpp/src/qpid/sys/posix/Time.h
diff --git a/cpp/src/qpid/sys/posix/check.h b/qpid/cpp/src/qpid/sys/posix/check.h
index 1bfe5d6d78..1bfe5d6d78 100644
--- a/cpp/src/qpid/sys/posix/check.h
+++ b/qpid/cpp/src/qpid/sys/posix/check.h
diff --git a/cpp/src/qpid/sys/rdma/RdmaClient.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
index 504000af08..504000af08 100644
--- a/cpp/src/qpid/sys/rdma/RdmaClient.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaClient.cpp
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
index 2cc6573b74..2cc6573b74 100644
--- a/cpp/src/qpid/sys/rdma/RdmaIO.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.cpp
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.h b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
index ec9caaf08d..ec9caaf08d 100644
--- a/cpp/src/qpid/sys/rdma/RdmaIO.h
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaIO.h
diff --git a/cpp/src/qpid/sys/rdma/RdmaServer.cpp b/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
index 9b0710fd8f..9b0710fd8f 100644
--- a/cpp/src/qpid/sys/rdma/RdmaServer.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/RdmaServer.cpp
diff --git a/cpp/src/qpid/sys/rdma/rdma_exception.h b/qpid/cpp/src/qpid/sys/rdma/rdma_exception.h
index a3a289e38a..a3a289e38a 100644
--- a/cpp/src/qpid/sys/rdma/rdma_exception.h
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_exception.h
diff --git a/cpp/src/qpid/sys/rdma/rdma_factories.cpp b/qpid/cpp/src/qpid/sys/rdma/rdma_factories.cpp
index a66f5b4035..a66f5b4035 100644
--- a/cpp/src/qpid/sys/rdma/rdma_factories.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_factories.cpp
diff --git a/cpp/src/qpid/sys/rdma/rdma_factories.h b/qpid/cpp/src/qpid/sys/rdma/rdma_factories.h
index bfca71fc7e..bfca71fc7e 100644
--- a/cpp/src/qpid/sys/rdma/rdma_factories.h
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_factories.h
diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
index 39c7cc2ab4..39c7cc2ab4 100644
--- a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.h b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
index 5d9b681da8..5d9b681da8 100644
--- a/cpp/src/qpid/sys/rdma/rdma_wrap.h
+++ b/qpid/cpp/src/qpid/sys/rdma/rdma_wrap.h
diff --git a/cpp/src/qpid/sys/regex.h b/qpid/cpp/src/qpid/sys/regex.h
index 77de6a7f5c..77de6a7f5c 100644
--- a/cpp/src/qpid/sys/regex.h
+++ b/qpid/cpp/src/qpid/sys/regex.h
diff --git a/cpp/src/qpid/sys/solaris/ECFPoller.cpp b/qpid/cpp/src/qpid/sys/solaris/ECFPoller.cpp
index 06d542c938..06d542c938 100644
--- a/cpp/src/qpid/sys/solaris/ECFPoller.cpp
+++ b/qpid/cpp/src/qpid/sys/solaris/ECFPoller.cpp
diff --git a/cpp/src/qpid/sys/solaris/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp
index 0e754e048b..0e754e048b 100755
--- a/cpp/src/qpid/sys/solaris/SystemInfo.cpp
+++ b/qpid/cpp/src/qpid/sys/solaris/SystemInfo.cpp
diff --git a/cpp/src/qpid/sys/ssl/SslSocket.cpp b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
index 32bc78d22d..32bc78d22d 100644
--- a/cpp/src/qpid/sys/ssl/SslSocket.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.cpp
diff --git a/cpp/src/qpid/sys/ssl/SslSocket.h b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
index 2407a1bf4b..2407a1bf4b 100644
--- a/cpp/src/qpid/sys/ssl/SslSocket.h
+++ b/qpid/cpp/src/qpid/sys/ssl/SslSocket.h
diff --git a/cpp/src/qpid/sys/ssl/check.cpp b/qpid/cpp/src/qpid/sys/ssl/check.cpp
index 72a2e265bd..72a2e265bd 100644
--- a/cpp/src/qpid/sys/ssl/check.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/check.cpp
diff --git a/cpp/src/qpid/sys/ssl/check.h b/qpid/cpp/src/qpid/sys/ssl/check.h
index 28d3c74ad0..28d3c74ad0 100644
--- a/cpp/src/qpid/sys/ssl/check.h
+++ b/qpid/cpp/src/qpid/sys/ssl/check.h
diff --git a/cpp/src/qpid/sys/ssl/util.cpp b/qpid/cpp/src/qpid/sys/ssl/util.cpp
index 9f5493cbbf..9f5493cbbf 100644
--- a/cpp/src/qpid/sys/ssl/util.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/util.cpp
diff --git a/cpp/src/qpid/sys/ssl/util.h b/qpid/cpp/src/qpid/sys/ssl/util.h
index f34adab7be..f34adab7be 100644
--- a/cpp/src/qpid/sys/ssl/util.h
+++ b/qpid/cpp/src/qpid/sys/ssl/util.h
diff --git a/cpp/src/qpid/sys/unordered_map.h b/qpid/cpp/src/qpid/sys/unordered_map.h
index 1b27770804..1b27770804 100644
--- a/cpp/src/qpid/sys/unordered_map.h
+++ b/qpid/cpp/src/qpid/sys/unordered_map.h
diff --git a/cpp/src/qpid/sys/urlAdd.h b/qpid/cpp/src/qpid/sys/urlAdd.h
index e78c5d586c..e78c5d586c 100644
--- a/cpp/src/qpid/sys/urlAdd.h
+++ b/qpid/cpp/src/qpid/sys/urlAdd.h
diff --git a/cpp/src/qpid/sys/uuid.h b/qpid/cpp/src/qpid/sys/uuid.h
index 6c32c059c4..6c32c059c4 100644
--- a/cpp/src/qpid/sys/uuid.h
+++ b/qpid/cpp/src/qpid/sys/uuid.h
diff --git a/cpp/src/qpid/sys/windows/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
index d65aad1304..d65aad1304 100644
--- a/cpp/src/qpid/sys/windows/AsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
diff --git a/cpp/src/qpid/sys/windows/AsynchIO.h b/qpid/cpp/src/qpid/sys/windows/AsynchIO.h
index a50864b561..a50864b561 100644
--- a/cpp/src/qpid/sys/windows/AsynchIO.h
+++ b/qpid/cpp/src/qpid/sys/windows/AsynchIO.h
diff --git a/cpp/src/qpid/sys/windows/AsynchIoResult.h b/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h
index 27e4c22138..27e4c22138 100755
--- a/cpp/src/qpid/sys/windows/AsynchIoResult.h
+++ b/qpid/cpp/src/qpid/sys/windows/AsynchIoResult.h
diff --git a/cpp/src/qpid/sys/windows/Condition.h b/qpid/cpp/src/qpid/sys/windows/Condition.h
index cd5aebbf09..cd5aebbf09 100755
--- a/cpp/src/qpid/sys/windows/Condition.h
+++ b/qpid/cpp/src/qpid/sys/windows/Condition.h
diff --git a/cpp/src/qpid/sys/windows/FileSysDir.cpp b/qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp
index 5128f0f8d6..5128f0f8d6 100644
--- a/cpp/src/qpid/sys/windows/FileSysDir.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/FileSysDir.cpp
diff --git a/cpp/src/qpid/sys/windows/IOHandle.cpp b/qpid/cpp/src/qpid/sys/windows/IOHandle.cpp
index 19a1c44875..19a1c44875 100755
--- a/cpp/src/qpid/sys/windows/IOHandle.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/IOHandle.cpp
diff --git a/cpp/src/qpid/sys/windows/IoHandlePrivate.h b/qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h
index 4529ad93ec..4529ad93ec 100755
--- a/cpp/src/qpid/sys/windows/IoHandlePrivate.h
+++ b/qpid/cpp/src/qpid/sys/windows/IoHandlePrivate.h
diff --git a/cpp/src/qpid/sys/windows/IocpPoller.cpp b/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
index ecb33c5517..ecb33c5517 100755
--- a/cpp/src/qpid/sys/windows/IocpPoller.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/IocpPoller.cpp
diff --git a/cpp/src/qpid/sys/windows/LockFile.cpp b/qpid/cpp/src/qpid/sys/windows/LockFile.cpp
index 048c2d5b18..048c2d5b18 100755
--- a/cpp/src/qpid/sys/windows/LockFile.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/LockFile.cpp
diff --git a/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp b/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp
index 60b3df7da6..60b3df7da6 100644
--- a/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/MemoryMappedFile.cpp
diff --git a/cpp/src/qpid/sys/windows/Mutex.h b/qpid/cpp/src/qpid/sys/windows/Mutex.h
index 5dcc69e836..5dcc69e836 100755
--- a/cpp/src/qpid/sys/windows/Mutex.h
+++ b/qpid/cpp/src/qpid/sys/windows/Mutex.h
diff --git a/cpp/src/qpid/sys/windows/Path.cpp b/qpid/cpp/src/qpid/sys/windows/Path.cpp
index 1cb4521fde..1cb4521fde 100644
--- a/cpp/src/qpid/sys/windows/Path.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Path.cpp
diff --git a/cpp/src/qpid/sys/windows/PipeHandle.cpp b/qpid/cpp/src/qpid/sys/windows/PipeHandle.cpp
index 062458ae5f..062458ae5f 100755
--- a/cpp/src/qpid/sys/windows/PipeHandle.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/PipeHandle.cpp
diff --git a/cpp/src/qpid/sys/windows/PollableCondition.cpp b/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
index 3e2a5fb36c..3e2a5fb36c 100644
--- a/cpp/src/qpid/sys/windows/PollableCondition.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/PollableCondition.cpp
diff --git a/cpp/src/qpid/sys/windows/QpidDllMain.h b/qpid/cpp/src/qpid/sys/windows/QpidDllMain.h
index 74eaf0256a..74eaf0256a 100644
--- a/cpp/src/qpid/sys/windows/QpidDllMain.h
+++ b/qpid/cpp/src/qpid/sys/windows/QpidDllMain.h
diff --git a/cpp/src/qpid/sys/windows/Shlib.cpp b/qpid/cpp/src/qpid/sys/windows/Shlib.cpp
index ba18747eb4..ba18747eb4 100644
--- a/cpp/src/qpid/sys/windows/Shlib.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Shlib.cpp
diff --git a/cpp/src/qpid/sys/windows/SocketAddress.cpp b/qpid/cpp/src/qpid/sys/windows/SocketAddress.cpp
index b0903752c6..b0903752c6 100644
--- a/cpp/src/qpid/sys/windows/SocketAddress.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/SocketAddress.cpp
diff --git a/cpp/src/qpid/sys/windows/SslAsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
index 29f673c156..29f673c156 100644
--- a/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.cpp
diff --git a/cpp/src/qpid/sys/windows/SslAsynchIO.h b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.h
index 3d00e1c429..3d00e1c429 100644
--- a/cpp/src/qpid/sys/windows/SslAsynchIO.h
+++ b/qpid/cpp/src/qpid/sys/windows/SslAsynchIO.h
diff --git a/cpp/src/qpid/sys/windows/SslCredential.cpp b/qpid/cpp/src/qpid/sys/windows/SslCredential.cpp
index de8f10b0e9..de8f10b0e9 100644
--- a/cpp/src/qpid/sys/windows/SslCredential.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/SslCredential.cpp
diff --git a/cpp/src/qpid/sys/windows/SslCredential.h b/qpid/cpp/src/qpid/sys/windows/SslCredential.h
index 25d174a2fa..25d174a2fa 100644
--- a/cpp/src/qpid/sys/windows/SslCredential.h
+++ b/qpid/cpp/src/qpid/sys/windows/SslCredential.h
diff --git a/cpp/src/qpid/sys/windows/StrError.cpp b/qpid/cpp/src/qpid/sys/windows/StrError.cpp
index 546d399d16..546d399d16 100755
--- a/cpp/src/qpid/sys/windows/StrError.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/StrError.cpp
diff --git a/cpp/src/qpid/sys/windows/SystemInfo.cpp b/qpid/cpp/src/qpid/sys/windows/SystemInfo.cpp
index fb58d53b81..fb58d53b81 100755
--- a/cpp/src/qpid/sys/windows/SystemInfo.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/SystemInfo.cpp
diff --git a/cpp/src/qpid/sys/windows/Thread.cpp b/qpid/cpp/src/qpid/sys/windows/Thread.cpp
index 8034680664..8034680664 100755
--- a/cpp/src/qpid/sys/windows/Thread.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Thread.cpp
diff --git a/cpp/src/qpid/sys/windows/Time.cpp b/qpid/cpp/src/qpid/sys/windows/Time.cpp
index 4169ef1f0a..4169ef1f0a 100644
--- a/cpp/src/qpid/sys/windows/Time.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/Time.cpp
diff --git a/cpp/src/qpid/sys/windows/Time.h b/qpid/cpp/src/qpid/sys/windows/Time.h
index 2987b1c8b2..2987b1c8b2 100644
--- a/cpp/src/qpid/sys/windows/Time.h
+++ b/qpid/cpp/src/qpid/sys/windows/Time.h
diff --git a/cpp/src/qpid/sys/windows/WinSocket.cpp b/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp
index 5637f6a9fb..5637f6a9fb 100644
--- a/cpp/src/qpid/sys/windows/WinSocket.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/WinSocket.cpp
diff --git a/cpp/src/qpid/sys/windows/WinSocket.h b/qpid/cpp/src/qpid/sys/windows/WinSocket.h
index bee6a58e7a..bee6a58e7a 100644
--- a/cpp/src/qpid/sys/windows/WinSocket.h
+++ b/qpid/cpp/src/qpid/sys/windows/WinSocket.h
diff --git a/cpp/src/qpid/sys/windows/check.h b/qpid/cpp/src/qpid/sys/windows/check.h
index 2a8e439bed..2a8e439bed 100755
--- a/cpp/src/qpid/sys/windows/check.h
+++ b/qpid/cpp/src/qpid/sys/windows/check.h
diff --git a/cpp/src/qpid/sys/windows/mingw32_compat.h b/qpid/cpp/src/qpid/sys/windows/mingw32_compat.h
index 51f613cc25..51f613cc25 100644
--- a/cpp/src/qpid/sys/windows/mingw32_compat.h
+++ b/qpid/cpp/src/qpid/sys/windows/mingw32_compat.h
diff --git a/cpp/src/qpid/sys/windows/util.cpp b/qpid/cpp/src/qpid/sys/windows/util.cpp
index 75aef26c35..75aef26c35 100644
--- a/cpp/src/qpid/sys/windows/util.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/util.cpp
diff --git a/cpp/src/qpid/sys/windows/util.h b/qpid/cpp/src/qpid/sys/windows/util.h
index 2855a90955..2855a90955 100644
--- a/cpp/src/qpid/sys/windows/util.h
+++ b/qpid/cpp/src/qpid/sys/windows/util.h
diff --git a/cpp/src/qpid/sys/windows/uuid.cpp b/qpid/cpp/src/qpid/sys/windows/uuid.cpp
index 4ff75ca627..4ff75ca627 100644
--- a/cpp/src/qpid/sys/windows/uuid.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/uuid.cpp
diff --git a/cpp/src/qpid/types/Exception.cpp b/qpid/cpp/src/qpid/types/Exception.cpp
index 71390e6abd..71390e6abd 100644
--- a/cpp/src/qpid/types/Exception.cpp
+++ b/qpid/cpp/src/qpid/types/Exception.cpp
diff --git a/cpp/src/qpid/types/Uuid.cpp b/qpid/cpp/src/qpid/types/Uuid.cpp
index c0e38e1da5..c0e38e1da5 100644
--- a/cpp/src/qpid/types/Uuid.cpp
+++ b/qpid/cpp/src/qpid/types/Uuid.cpp
diff --git a/cpp/src/qpid/types/Variant.cpp b/qpid/cpp/src/qpid/types/Variant.cpp
index 26dbe0c91e..26dbe0c91e 100644
--- a/cpp/src/qpid/types/Variant.cpp
+++ b/qpid/cpp/src/qpid/types/Variant.cpp
diff --git a/cpp/src/qpid/types/encodings.h b/qpid/cpp/src/qpid/types/encodings.h
index 571e8607aa..571e8607aa 100644
--- a/cpp/src/qpid/types/encodings.h
+++ b/qpid/cpp/src/qpid/types/encodings.h
diff --git a/cpp/src/qpid/xml/XmlExchange.cpp b/qpid/cpp/src/qpid/xml/XmlExchange.cpp
index ffe9a66656..ffe9a66656 100644
--- a/cpp/src/qpid/xml/XmlExchange.cpp
+++ b/qpid/cpp/src/qpid/xml/XmlExchange.cpp
diff --git a/cpp/src/qpid/xml/XmlExchange.h b/qpid/cpp/src/qpid/xml/XmlExchange.h
index 4115f3d530..4115f3d530 100644
--- a/cpp/src/qpid/xml/XmlExchange.h
+++ b/qpid/cpp/src/qpid/xml/XmlExchange.h
diff --git a/cpp/src/qpid/xml/XmlExchangePlugin.cpp b/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp
index 02f0110faf..02f0110faf 100644
--- a/cpp/src/qpid/xml/XmlExchangePlugin.cpp
+++ b/qpid/cpp/src/qpid/xml/XmlExchangePlugin.cpp
diff --git a/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp
index e17dea3164..e17dea3164 100644
--- a/cpp/src/qpidd.cpp
+++ b/qpid/cpp/src/qpidd.cpp
diff --git a/cpp/src/qpidd.h b/qpid/cpp/src/qpidd.h
index 38328139c3..38328139c3 100644
--- a/cpp/src/qpidd.h
+++ b/qpid/cpp/src/qpidd.h
diff --git a/cpp/src/rdma.cmake b/qpid/cpp/src/rdma.cmake
index 9db06269af..9db06269af 100644
--- a/cpp/src/rdma.cmake
+++ b/qpid/cpp/src/rdma.cmake
diff --git a/cpp/src/tests/.valgrind.supp b/qpid/cpp/src/tests/.valgrind.supp
index 1a24a9178e..1a24a9178e 100644
--- a/cpp/src/tests/.valgrind.supp
+++ b/qpid/cpp/src/tests/.valgrind.supp
diff --git a/cpp/src/tests/AccumulatedAckTest.cpp b/qpid/cpp/src/tests/AccumulatedAckTest.cpp
index c736a519d2..c736a519d2 100644
--- a/cpp/src/tests/AccumulatedAckTest.cpp
+++ b/qpid/cpp/src/tests/AccumulatedAckTest.cpp
diff --git a/cpp/src/tests/Acl.cpp b/qpid/cpp/src/tests/Acl.cpp
index 9c3de0de62..9c3de0de62 100644
--- a/cpp/src/tests/Acl.cpp
+++ b/qpid/cpp/src/tests/Acl.cpp
diff --git a/cpp/src/tests/AclHost.cpp b/qpid/cpp/src/tests/AclHost.cpp
index 7d60c5a63d..7d60c5a63d 100644
--- a/cpp/src/tests/AclHost.cpp
+++ b/qpid/cpp/src/tests/AclHost.cpp
diff --git a/cpp/src/tests/Address.cpp b/qpid/cpp/src/tests/Address.cpp
index 0fd3585958..0fd3585958 100644
--- a/cpp/src/tests/Address.cpp
+++ b/qpid/cpp/src/tests/Address.cpp
diff --git a/cpp/src/tests/Array.cpp b/qpid/cpp/src/tests/Array.cpp
index 8ce7615162..8ce7615162 100644
--- a/cpp/src/tests/Array.cpp
+++ b/qpid/cpp/src/tests/Array.cpp
diff --git a/cpp/src/tests/AsyncCompletion.cpp b/qpid/cpp/src/tests/AsyncCompletion.cpp
index dc43f10156..dc43f10156 100644
--- a/cpp/src/tests/AsyncCompletion.cpp
+++ b/qpid/cpp/src/tests/AsyncCompletion.cpp
diff --git a/cpp/src/tests/AtomicValue.cpp b/qpid/cpp/src/tests/AtomicValue.cpp
index d855d993a7..d855d993a7 100644
--- a/cpp/src/tests/AtomicValue.cpp
+++ b/qpid/cpp/src/tests/AtomicValue.cpp
diff --git a/cpp/src/tests/Blob.cpp b/qpid/cpp/src/tests/Blob.cpp
index 9878d92fe4..9878d92fe4 100644
--- a/cpp/src/tests/Blob.cpp
+++ b/qpid/cpp/src/tests/Blob.cpp
diff --git a/cpp/src/tests/BrokerFixture.h b/qpid/cpp/src/tests/BrokerFixture.h
index 474b9d747f..474b9d747f 100644
--- a/cpp/src/tests/BrokerFixture.h
+++ b/qpid/cpp/src/tests/BrokerFixture.h
diff --git a/cpp/src/tests/BrokerMgmtAgent.cpp b/qpid/cpp/src/tests/BrokerMgmtAgent.cpp
index bad7e768a6..bad7e768a6 100644
--- a/cpp/src/tests/BrokerMgmtAgent.cpp
+++ b/qpid/cpp/src/tests/BrokerMgmtAgent.cpp
diff --git a/cpp/src/tests/BrokerMgmtAgent.xml b/qpid/cpp/src/tests/BrokerMgmtAgent.xml
index 202b8debf3..202b8debf3 100644
--- a/cpp/src/tests/BrokerMgmtAgent.xml
+++ b/qpid/cpp/src/tests/BrokerMgmtAgent.xml
diff --git a/cpp/src/tests/BrokerOptions.cpp b/qpid/cpp/src/tests/BrokerOptions.cpp
index b36d96916a..b36d96916a 100644
--- a/cpp/src/tests/BrokerOptions.cpp
+++ b/qpid/cpp/src/tests/BrokerOptions.cpp
diff --git a/cpp/src/tests/CMakeLists.txt b/qpid/cpp/src/tests/CMakeLists.txt
index 20f98204a4..20f98204a4 100644
--- a/cpp/src/tests/CMakeLists.txt
+++ b/qpid/cpp/src/tests/CMakeLists.txt
diff --git a/cpp/src/tests/ClientMessage.cpp b/qpid/cpp/src/tests/ClientMessage.cpp
index 994c46552c..994c46552c 100644
--- a/cpp/src/tests/ClientMessage.cpp
+++ b/qpid/cpp/src/tests/ClientMessage.cpp
diff --git a/cpp/src/tests/ClientMessageTest.cpp b/qpid/cpp/src/tests/ClientMessageTest.cpp
index f925f1c234..f925f1c234 100644
--- a/cpp/src/tests/ClientMessageTest.cpp
+++ b/qpid/cpp/src/tests/ClientMessageTest.cpp
diff --git a/cpp/src/tests/ClientSessionTest.cpp b/qpid/cpp/src/tests/ClientSessionTest.cpp
index f35524c0c0..f35524c0c0 100644
--- a/cpp/src/tests/ClientSessionTest.cpp
+++ b/qpid/cpp/src/tests/ClientSessionTest.cpp
diff --git a/cpp/src/tests/ConnectionOptions.h b/qpid/cpp/src/tests/ConnectionOptions.h
index fe945e9ddd..fe945e9ddd 100644
--- a/cpp/src/tests/ConnectionOptions.h
+++ b/qpid/cpp/src/tests/ConnectionOptions.h
diff --git a/cpp/src/tests/DeliveryRecordTest.cpp b/qpid/cpp/src/tests/DeliveryRecordTest.cpp
index 37b3095f81..37b3095f81 100644
--- a/cpp/src/tests/DeliveryRecordTest.cpp
+++ b/qpid/cpp/src/tests/DeliveryRecordTest.cpp
diff --git a/cpp/src/tests/DispatcherTest.cpp b/qpid/cpp/src/tests/DispatcherTest.cpp
index 7312fe8d2e..7312fe8d2e 100644
--- a/cpp/src/tests/DispatcherTest.cpp
+++ b/qpid/cpp/src/tests/DispatcherTest.cpp
diff --git a/cpp/src/tests/DtxWorkRecordTest.cpp b/qpid/cpp/src/tests/DtxWorkRecordTest.cpp
index bcb3fc14a1..bcb3fc14a1 100644
--- a/cpp/src/tests/DtxWorkRecordTest.cpp
+++ b/qpid/cpp/src/tests/DtxWorkRecordTest.cpp
diff --git a/cpp/src/tests/ExchangeTest.cpp b/qpid/cpp/src/tests/ExchangeTest.cpp
index df0684e832..df0684e832 100644
--- a/cpp/src/tests/ExchangeTest.cpp
+++ b/qpid/cpp/src/tests/ExchangeTest.cpp
diff --git a/cpp/src/tests/FieldTable.cpp b/qpid/cpp/src/tests/FieldTable.cpp
index c040f1d433..c040f1d433 100644
--- a/cpp/src/tests/FieldTable.cpp
+++ b/qpid/cpp/src/tests/FieldTable.cpp
diff --git a/cpp/src/tests/FieldValue.cpp b/qpid/cpp/src/tests/FieldValue.cpp
index 9cea48e3cf..9cea48e3cf 100644
--- a/cpp/src/tests/FieldValue.cpp
+++ b/qpid/cpp/src/tests/FieldValue.cpp
diff --git a/cpp/src/tests/Frame.cpp b/qpid/cpp/src/tests/Frame.cpp
index cfcfde04a7..cfcfde04a7 100644
--- a/cpp/src/tests/Frame.cpp
+++ b/qpid/cpp/src/tests/Frame.cpp
diff --git a/cpp/src/tests/FrameDecoder.cpp b/qpid/cpp/src/tests/FrameDecoder.cpp
index 9eeff2a41e..9eeff2a41e 100644
--- a/cpp/src/tests/FrameDecoder.cpp
+++ b/qpid/cpp/src/tests/FrameDecoder.cpp
diff --git a/cpp/src/tests/FramingTest.cpp b/qpid/cpp/src/tests/FramingTest.cpp
index 2392b6fec4..2392b6fec4 100644
--- a/cpp/src/tests/FramingTest.cpp
+++ b/qpid/cpp/src/tests/FramingTest.cpp
diff --git a/cpp/src/tests/HeaderTest.cpp b/qpid/cpp/src/tests/HeaderTest.cpp
index 4b16f3c793..4b16f3c793 100644
--- a/cpp/src/tests/HeaderTest.cpp
+++ b/qpid/cpp/src/tests/HeaderTest.cpp
diff --git a/cpp/src/tests/HeadersExchangeTest.cpp b/qpid/cpp/src/tests/HeadersExchangeTest.cpp
index 3e68b84bc3..3e68b84bc3 100644
--- a/cpp/src/tests/HeadersExchangeTest.cpp
+++ b/qpid/cpp/src/tests/HeadersExchangeTest.cpp
diff --git a/cpp/src/tests/InlineAllocator.cpp b/qpid/cpp/src/tests/InlineAllocator.cpp
index a4c4d64cea..a4c4d64cea 100644
--- a/cpp/src/tests/InlineAllocator.cpp
+++ b/qpid/cpp/src/tests/InlineAllocator.cpp
diff --git a/cpp/src/tests/InlineVector.cpp b/qpid/cpp/src/tests/InlineVector.cpp
index ba5165886d..ba5165886d 100644
--- a/cpp/src/tests/InlineVector.cpp
+++ b/qpid/cpp/src/tests/InlineVector.cpp
diff --git a/cpp/src/tests/ManagementTest.cpp b/qpid/cpp/src/tests/ManagementTest.cpp
index 98ef591fae..98ef591fae 100644
--- a/cpp/src/tests/ManagementTest.cpp
+++ b/qpid/cpp/src/tests/ManagementTest.cpp
diff --git a/cpp/src/tests/MessageReplayTracker.cpp b/qpid/cpp/src/tests/MessageReplayTracker.cpp
index c0778247f0..c0778247f0 100644
--- a/cpp/src/tests/MessageReplayTracker.cpp
+++ b/qpid/cpp/src/tests/MessageReplayTracker.cpp
diff --git a/cpp/src/tests/MessageTest.cpp b/qpid/cpp/src/tests/MessageTest.cpp
index a6c5157b47..a6c5157b47 100644
--- a/cpp/src/tests/MessageTest.cpp
+++ b/qpid/cpp/src/tests/MessageTest.cpp
diff --git a/cpp/src/tests/MessageUtils.h b/qpid/cpp/src/tests/MessageUtils.h
index f05b0d8b20..f05b0d8b20 100644
--- a/cpp/src/tests/MessageUtils.h
+++ b/qpid/cpp/src/tests/MessageUtils.h
diff --git a/cpp/src/tests/MessagingFixture.h b/qpid/cpp/src/tests/MessagingFixture.h
index 165aefeeec..165aefeeec 100644
--- a/cpp/src/tests/MessagingFixture.h
+++ b/qpid/cpp/src/tests/MessagingFixture.h
diff --git a/cpp/src/tests/MessagingLogger.cpp b/qpid/cpp/src/tests/MessagingLogger.cpp
index 195a33db12..195a33db12 100644
--- a/cpp/src/tests/MessagingLogger.cpp
+++ b/qpid/cpp/src/tests/MessagingLogger.cpp
diff --git a/cpp/src/tests/MessagingSessionTests.cpp b/qpid/cpp/src/tests/MessagingSessionTests.cpp
index d01dd69999..d01dd69999 100644
--- a/cpp/src/tests/MessagingSessionTests.cpp
+++ b/qpid/cpp/src/tests/MessagingSessionTests.cpp
diff --git a/cpp/src/tests/MessagingThreadTests.cpp b/qpid/cpp/src/tests/MessagingThreadTests.cpp
index 48264735b1..48264735b1 100644
--- a/cpp/src/tests/MessagingThreadTests.cpp
+++ b/qpid/cpp/src/tests/MessagingThreadTests.cpp
diff --git a/cpp/src/tests/PollableCondition.cpp b/qpid/cpp/src/tests/PollableCondition.cpp
index f9b3c25c93..f9b3c25c93 100644
--- a/cpp/src/tests/PollableCondition.cpp
+++ b/qpid/cpp/src/tests/PollableCondition.cpp
diff --git a/cpp/src/tests/PollerTest.cpp b/qpid/cpp/src/tests/PollerTest.cpp
index 5a1d02964c..5a1d02964c 100644
--- a/cpp/src/tests/PollerTest.cpp
+++ b/qpid/cpp/src/tests/PollerTest.cpp
diff --git a/cpp/src/tests/ProxyTest.cpp b/qpid/cpp/src/tests/ProxyTest.cpp
index a926b28395..a926b28395 100644
--- a/cpp/src/tests/ProxyTest.cpp
+++ b/qpid/cpp/src/tests/ProxyTest.cpp
diff --git a/cpp/src/tests/Qmf2.cpp b/qpid/cpp/src/tests/Qmf2.cpp
index bc263d5c6d..bc263d5c6d 100644
--- a/cpp/src/tests/Qmf2.cpp
+++ b/qpid/cpp/src/tests/Qmf2.cpp
diff --git a/cpp/src/tests/QueueDepth.cpp b/qpid/cpp/src/tests/QueueDepth.cpp
index 09b221b3a8..09b221b3a8 100644
--- a/cpp/src/tests/QueueDepth.cpp
+++ b/qpid/cpp/src/tests/QueueDepth.cpp
diff --git a/cpp/src/tests/QueueFlowLimitTest.cpp b/qpid/cpp/src/tests/QueueFlowLimitTest.cpp
index b35294922d..b35294922d 100644
--- a/cpp/src/tests/QueueFlowLimitTest.cpp
+++ b/qpid/cpp/src/tests/QueueFlowLimitTest.cpp
diff --git a/cpp/src/tests/QueueOptionsTest.cpp b/qpid/cpp/src/tests/QueueOptionsTest.cpp
index bdb83d7d22..bdb83d7d22 100644
--- a/cpp/src/tests/QueueOptionsTest.cpp
+++ b/qpid/cpp/src/tests/QueueOptionsTest.cpp
diff --git a/cpp/src/tests/QueuePolicyTest.cpp b/qpid/cpp/src/tests/QueuePolicyTest.cpp
index f61c283fd4..f61c283fd4 100644
--- a/cpp/src/tests/QueuePolicyTest.cpp
+++ b/qpid/cpp/src/tests/QueuePolicyTest.cpp
diff --git a/cpp/src/tests/QueueRegistryTest.cpp b/qpid/cpp/src/tests/QueueRegistryTest.cpp
index 364d66c525..364d66c525 100644
--- a/cpp/src/tests/QueueRegistryTest.cpp
+++ b/qpid/cpp/src/tests/QueueRegistryTest.cpp
diff --git a/cpp/src/tests/QueueTest.cpp b/qpid/cpp/src/tests/QueueTest.cpp
index ee9d37e76d..ee9d37e76d 100644
--- a/cpp/src/tests/QueueTest.cpp
+++ b/qpid/cpp/src/tests/QueueTest.cpp
diff --git a/cpp/src/tests/README.txt b/qpid/cpp/src/tests/README.txt
index 8eaa5bbd25..8eaa5bbd25 100644
--- a/cpp/src/tests/README.txt
+++ b/qpid/cpp/src/tests/README.txt
diff --git a/cpp/src/tests/RangeSet.cpp b/qpid/cpp/src/tests/RangeSet.cpp
index 285f432bf7..285f432bf7 100644
--- a/cpp/src/tests/RangeSet.cpp
+++ b/qpid/cpp/src/tests/RangeSet.cpp
diff --git a/cpp/src/tests/RefCounted.cpp b/qpid/cpp/src/tests/RefCounted.cpp
index 3ac3895322..3ac3895322 100644
--- a/cpp/src/tests/RefCounted.cpp
+++ b/qpid/cpp/src/tests/RefCounted.cpp
diff --git a/cpp/src/tests/RetryList.cpp b/qpid/cpp/src/tests/RetryList.cpp
index 50cd5edfe8..50cd5edfe8 100644
--- a/cpp/src/tests/RetryList.cpp
+++ b/qpid/cpp/src/tests/RetryList.cpp
diff --git a/cpp/src/tests/Selector.cpp b/qpid/cpp/src/tests/Selector.cpp
index 73af1a9623..73af1a9623 100644
--- a/cpp/src/tests/Selector.cpp
+++ b/qpid/cpp/src/tests/Selector.cpp
diff --git a/cpp/src/tests/SequenceNumberTest.cpp b/qpid/cpp/src/tests/SequenceNumberTest.cpp
index f3c934e3ca..f3c934e3ca 100644
--- a/cpp/src/tests/SequenceNumberTest.cpp
+++ b/qpid/cpp/src/tests/SequenceNumberTest.cpp
diff --git a/cpp/src/tests/SequenceSet.cpp b/qpid/cpp/src/tests/SequenceSet.cpp
index bc0a8ea509..bc0a8ea509 100644
--- a/cpp/src/tests/SequenceSet.cpp
+++ b/qpid/cpp/src/tests/SequenceSet.cpp
diff --git a/cpp/src/tests/SessionState.cpp b/qpid/cpp/src/tests/SessionState.cpp
index 1cf3415484..1cf3415484 100644
--- a/cpp/src/tests/SessionState.cpp
+++ b/qpid/cpp/src/tests/SessionState.cpp
diff --git a/cpp/src/tests/Shlib.cpp b/qpid/cpp/src/tests/Shlib.cpp
index 7f01323e3c..7f01323e3c 100644
--- a/cpp/src/tests/Shlib.cpp
+++ b/qpid/cpp/src/tests/Shlib.cpp
diff --git a/cpp/src/tests/Statistics.cpp b/qpid/cpp/src/tests/Statistics.cpp
index 7cacde8b74..7cacde8b74 100644
--- a/cpp/src/tests/Statistics.cpp
+++ b/qpid/cpp/src/tests/Statistics.cpp
diff --git a/cpp/src/tests/Statistics.h b/qpid/cpp/src/tests/Statistics.h
index 091046a17f..091046a17f 100644
--- a/cpp/src/tests/Statistics.h
+++ b/qpid/cpp/src/tests/Statistics.h
diff --git a/cpp/src/tests/StringUtils.cpp b/qpid/cpp/src/tests/StringUtils.cpp
index c50287a4f4..c50287a4f4 100644
--- a/cpp/src/tests/StringUtils.cpp
+++ b/qpid/cpp/src/tests/StringUtils.cpp
diff --git a/cpp/src/tests/SystemInfo.cpp b/qpid/cpp/src/tests/SystemInfo.cpp
index 34f1ac408e..34f1ac408e 100644
--- a/cpp/src/tests/SystemInfo.cpp
+++ b/qpid/cpp/src/tests/SystemInfo.cpp
diff --git a/cpp/src/tests/TestMessageStore.h b/qpid/cpp/src/tests/TestMessageStore.h
index 0b63bc9c15..0b63bc9c15 100644
--- a/cpp/src/tests/TestMessageStore.h
+++ b/qpid/cpp/src/tests/TestMessageStore.h
diff --git a/cpp/src/tests/TestOptions.h b/qpid/cpp/src/tests/TestOptions.h
index f8da0f59cf..f8da0f59cf 100644
--- a/cpp/src/tests/TestOptions.h
+++ b/qpid/cpp/src/tests/TestOptions.h
diff --git a/cpp/src/tests/TimerTest.cpp b/qpid/cpp/src/tests/TimerTest.cpp
index d28eeeffc1..d28eeeffc1 100644
--- a/cpp/src/tests/TimerTest.cpp
+++ b/qpid/cpp/src/tests/TimerTest.cpp
diff --git a/cpp/src/tests/TopicExchangeTest.cpp b/qpid/cpp/src/tests/TopicExchangeTest.cpp
index d57951ea3f..d57951ea3f 100644
--- a/cpp/src/tests/TopicExchangeTest.cpp
+++ b/qpid/cpp/src/tests/TopicExchangeTest.cpp
diff --git a/cpp/src/tests/TransactionObserverTest.cpp b/qpid/cpp/src/tests/TransactionObserverTest.cpp
index 80ef494c21..80ef494c21 100644
--- a/cpp/src/tests/TransactionObserverTest.cpp
+++ b/qpid/cpp/src/tests/TransactionObserverTest.cpp
diff --git a/cpp/src/tests/TxBufferTest.cpp b/qpid/cpp/src/tests/TxBufferTest.cpp
index 3f052d213e..3f052d213e 100644
--- a/cpp/src/tests/TxBufferTest.cpp
+++ b/qpid/cpp/src/tests/TxBufferTest.cpp
diff --git a/cpp/src/tests/TxMocks.h b/qpid/cpp/src/tests/TxMocks.h
index 8b54e7484b..8b54e7484b 100644
--- a/cpp/src/tests/TxMocks.h
+++ b/qpid/cpp/src/tests/TxMocks.h
diff --git a/cpp/src/tests/Url.cpp b/qpid/cpp/src/tests/Url.cpp
index b30de682bc..b30de682bc 100644
--- a/cpp/src/tests/Url.cpp
+++ b/qpid/cpp/src/tests/Url.cpp
diff --git a/cpp/src/tests/Uuid.cpp b/qpid/cpp/src/tests/Uuid.cpp
index f9a67d9db0..f9a67d9db0 100644
--- a/cpp/src/tests/Uuid.cpp
+++ b/qpid/cpp/src/tests/Uuid.cpp
diff --git a/cpp/src/tests/Variant.cpp b/qpid/cpp/src/tests/Variant.cpp
index 5ae7fc89eb..5ae7fc89eb 100644
--- a/cpp/src/tests/Variant.cpp
+++ b/qpid/cpp/src/tests/Variant.cpp
diff --git a/cpp/src/tests/XmlClientSessionTest.cpp b/qpid/cpp/src/tests/XmlClientSessionTest.cpp
index bfa6ed096b..bfa6ed096b 100644
--- a/cpp/src/tests/XmlClientSessionTest.cpp
+++ b/qpid/cpp/src/tests/XmlClientSessionTest.cpp
diff --git a/cpp/src/tests/acl.py b/qpid/cpp/src/tests/acl.py
index 2838bd3f83..2838bd3f83 100755
--- a/cpp/src/tests/acl.py
+++ b/qpid/cpp/src/tests/acl.py
diff --git a/cpp/src/tests/ais_test.cpp b/qpid/cpp/src/tests/ais_test.cpp
index 00c61242e4..00c61242e4 100644
--- a/cpp/src/tests/ais_test.cpp
+++ b/qpid/cpp/src/tests/ais_test.cpp
diff --git a/cpp/src/tests/allhosts b/qpid/cpp/src/tests/allhosts
index 07bc04fff5..07bc04fff5 100755
--- a/cpp/src/tests/allhosts
+++ b/qpid/cpp/src/tests/allhosts
diff --git a/cpp/src/tests/assertions.py b/qpid/cpp/src/tests/assertions.py
index 930afd124d..930afd124d 100644
--- a/cpp/src/tests/assertions.py
+++ b/qpid/cpp/src/tests/assertions.py
diff --git a/cpp/src/tests/background.ps1 b/qpid/cpp/src/tests/background.ps1
index 36e9e4e6e9..36e9e4e6e9 100644
--- a/cpp/src/tests/background.ps1
+++ b/qpid/cpp/src/tests/background.ps1
diff --git a/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py
index 6fae88092b..6fae88092b 100644
--- a/cpp/src/tests/brokertest.py
+++ b/qpid/cpp/src/tests/brokertest.py
diff --git a/cpp/src/tests/cli_tests.py b/qpid/cpp/src/tests/cli_tests.py
index eee9bc648c..eee9bc648c 100755
--- a/cpp/src/tests/cli_tests.py
+++ b/qpid/cpp/src/tests/cli_tests.py
diff --git a/cpp/src/tests/config.null b/qpid/cpp/src/tests/config.null
index e2f355768b..e2f355768b 100644
--- a/cpp/src/tests/config.null
+++ b/qpid/cpp/src/tests/config.null
diff --git a/cpp/src/tests/consume.cpp b/qpid/cpp/src/tests/consume.cpp
index 69110d151f..69110d151f 100644
--- a/cpp/src/tests/consume.cpp
+++ b/qpid/cpp/src/tests/consume.cpp
diff --git a/cpp/src/tests/datagen.cpp b/qpid/cpp/src/tests/datagen.cpp
index acbc07d63c..acbc07d63c 100644
--- a/cpp/src/tests/datagen.cpp
+++ b/qpid/cpp/src/tests/datagen.cpp
diff --git a/cpp/src/tests/declare_queues.cpp b/qpid/cpp/src/tests/declare_queues.cpp
index bf85b9c04b..bf85b9c04b 100644
--- a/cpp/src/tests/declare_queues.cpp
+++ b/qpid/cpp/src/tests/declare_queues.cpp
diff --git a/cpp/src/tests/dlclose_noop.c b/qpid/cpp/src/tests/dlclose_noop.c
index b78cf486d8..b78cf486d8 100644
--- a/cpp/src/tests/dlclose_noop.c
+++ b/qpid/cpp/src/tests/dlclose_noop.c
diff --git a/cpp/src/tests/dynamic_log_hires_timestamp b/qpid/cpp/src/tests/dynamic_log_hires_timestamp
index 75034f9902..75034f9902 100755
--- a/cpp/src/tests/dynamic_log_hires_timestamp
+++ b/qpid/cpp/src/tests/dynamic_log_hires_timestamp
diff --git a/cpp/src/tests/dynamic_log_level_test b/qpid/cpp/src/tests/dynamic_log_level_test
index f8fd7a8dd8..f8fd7a8dd8 100755
--- a/cpp/src/tests/dynamic_log_level_test
+++ b/qpid/cpp/src/tests/dynamic_log_level_test
diff --git a/cpp/src/tests/echotest.cpp b/qpid/cpp/src/tests/echotest.cpp
index 7c30989098..7c30989098 100644
--- a/cpp/src/tests/echotest.cpp
+++ b/qpid/cpp/src/tests/echotest.cpp
diff --git a/cpp/src/tests/exception_test.cpp b/qpid/cpp/src/tests/exception_test.cpp
index 3e844b4e58..3e844b4e58 100644
--- a/cpp/src/tests/exception_test.cpp
+++ b/qpid/cpp/src/tests/exception_test.cpp
diff --git a/cpp/src/tests/failing-amqp0-10-python-tests b/qpid/cpp/src/tests/failing-amqp0-10-python-tests
index afa263217f..afa263217f 100644
--- a/cpp/src/tests/failing-amqp0-10-python-tests
+++ b/qpid/cpp/src/tests/failing-amqp0-10-python-tests
diff --git a/cpp/src/tests/failing-amqp1.0-python-tests b/qpid/cpp/src/tests/failing-amqp1.0-python-tests
index e76d05d7be..e76d05d7be 100644
--- a/cpp/src/tests/failing-amqp1.0-python-tests
+++ b/qpid/cpp/src/tests/failing-amqp1.0-python-tests
diff --git a/cpp/src/tests/fanout_perftest b/qpid/cpp/src/tests/fanout_perftest
index 168994d372..168994d372 100755
--- a/cpp/src/tests/fanout_perftest
+++ b/qpid/cpp/src/tests/fanout_perftest
diff --git a/cpp/src/tests/federated_topic_test b/qpid/cpp/src/tests/federated_topic_test
index 2d31f9af5a..2d31f9af5a 100755
--- a/cpp/src/tests/federated_topic_test
+++ b/qpid/cpp/src/tests/federated_topic_test
diff --git a/cpp/src/tests/federation.py b/qpid/cpp/src/tests/federation.py
index f5b62019e5..f5b62019e5 100755
--- a/cpp/src/tests/federation.py
+++ b/qpid/cpp/src/tests/federation.py
diff --git a/cpp/src/tests/federation_sys.py b/qpid/cpp/src/tests/federation_sys.py
index be9613bb9f..be9613bb9f 100755
--- a/cpp/src/tests/federation_sys.py
+++ b/qpid/cpp/src/tests/federation_sys.py
diff --git a/cpp/src/tests/find_prog.ps1 b/qpid/cpp/src/tests/find_prog.ps1
index 5c482debbf..5c482debbf 100644
--- a/cpp/src/tests/find_prog.ps1
+++ b/qpid/cpp/src/tests/find_prog.ps1
diff --git a/cpp/src/tests/ha_test.py b/qpid/cpp/src/tests/ha_test.py
index 82ca808cb1..82ca808cb1 100755
--- a/cpp/src/tests/ha_test.py
+++ b/qpid/cpp/src/tests/ha_test.py
diff --git a/cpp/src/tests/ha_test_max_queues.cpp b/qpid/cpp/src/tests/ha_test_max_queues.cpp
index fcce4c3151..fcce4c3151 100644
--- a/cpp/src/tests/ha_test_max_queues.cpp
+++ b/qpid/cpp/src/tests/ha_test_max_queues.cpp
diff --git a/cpp/src/tests/ha_tests.py b/qpid/cpp/src/tests/ha_tests.py
index 2ee2e291e2..2ee2e291e2 100755
--- a/cpp/src/tests/ha_tests.py
+++ b/qpid/cpp/src/tests/ha_tests.py
diff --git a/cpp/src/tests/header_test.cpp b/qpid/cpp/src/tests/header_test.cpp
index c36b4f3bc3..c36b4f3bc3 100644
--- a/cpp/src/tests/header_test.cpp
+++ b/qpid/cpp/src/tests/header_test.cpp
diff --git a/cpp/src/tests/header_test.py b/qpid/cpp/src/tests/header_test.py
index d5a2c16c01..d5a2c16c01 100755
--- a/cpp/src/tests/header_test.py
+++ b/qpid/cpp/src/tests/header_test.py
diff --git a/cpp/src/tests/headers_federation.py b/qpid/cpp/src/tests/headers_federation.py
index 60cff1da54..60cff1da54 100644
--- a/cpp/src/tests/headers_federation.py
+++ b/qpid/cpp/src/tests/headers_federation.py
diff --git a/cpp/src/tests/idle_timeout_tests.py b/qpid/cpp/src/tests/idle_timeout_tests.py
index 22a107a110..22a107a110 100755
--- a/cpp/src/tests/idle_timeout_tests.py
+++ b/qpid/cpp/src/tests/idle_timeout_tests.py
diff --git a/cpp/src/tests/install_env.sh.in b/qpid/cpp/src/tests/install_env.sh.in
index d29a23930d..d29a23930d 100644
--- a/cpp/src/tests/install_env.sh.in
+++ b/qpid/cpp/src/tests/install_env.sh.in
diff --git a/cpp/src/tests/interlink_tests.py b/qpid/cpp/src/tests/interlink_tests.py
index 3eec2422f1..3eec2422f1 100755
--- a/cpp/src/tests/interlink_tests.py
+++ b/qpid/cpp/src/tests/interlink_tests.py
diff --git a/cpp/src/tests/interop_tests.py b/qpid/cpp/src/tests/interop_tests.py
index f76b9f634b..f76b9f634b 100755
--- a/cpp/src/tests/interop_tests.py
+++ b/qpid/cpp/src/tests/interop_tests.py
diff --git a/cpp/src/tests/ipv6_test b/qpid/cpp/src/tests/ipv6_test
index 4ac5f95fba..4ac5f95fba 100755
--- a/cpp/src/tests/ipv6_test
+++ b/qpid/cpp/src/tests/ipv6_test
diff --git a/cpp/src/tests/legacystore/.valgrind.supp b/qpid/cpp/src/tests/legacystore/.valgrind.supp
index 5c1c5377bf..5c1c5377bf 100644
--- a/cpp/src/tests/legacystore/.valgrind.supp
+++ b/qpid/cpp/src/tests/legacystore/.valgrind.supp
diff --git a/cpp/src/tests/legacystore/.valgrindrc b/qpid/cpp/src/tests/legacystore/.valgrindrc
index 4aba7661de..4aba7661de 100644
--- a/cpp/src/tests/legacystore/.valgrindrc
+++ b/qpid/cpp/src/tests/legacystore/.valgrindrc
diff --git a/cpp/src/tests/legacystore/CMakeLists.txt b/qpid/cpp/src/tests/legacystore/CMakeLists.txt
index 5527f23255..5527f23255 100644
--- a/cpp/src/tests/legacystore/CMakeLists.txt
+++ b/qpid/cpp/src/tests/legacystore/CMakeLists.txt
diff --git a/cpp/src/tests/legacystore/MessageUtils.h b/qpid/cpp/src/tests/legacystore/MessageUtils.h
index cd23244293..cd23244293 100644
--- a/cpp/src/tests/legacystore/MessageUtils.h
+++ b/qpid/cpp/src/tests/legacystore/MessageUtils.h
diff --git a/cpp/src/tests/legacystore/TestFramework.cpp b/qpid/cpp/src/tests/legacystore/TestFramework.cpp
index 2f7faf7682..2f7faf7682 100644
--- a/cpp/src/tests/legacystore/TestFramework.cpp
+++ b/qpid/cpp/src/tests/legacystore/TestFramework.cpp
diff --git a/cpp/src/tests/legacystore/TestFramework.h b/qpid/cpp/src/tests/legacystore/TestFramework.h
index f3066db602..f3066db602 100644
--- a/cpp/src/tests/legacystore/TestFramework.h
+++ b/qpid/cpp/src/tests/legacystore/TestFramework.h
diff --git a/cpp/src/tests/legacystore/clean.sh b/qpid/cpp/src/tests/legacystore/clean.sh
index 838f246232..838f246232 100644
--- a/cpp/src/tests/legacystore/clean.sh
+++ b/qpid/cpp/src/tests/legacystore/clean.sh
diff --git a/cpp/src/tests/legacystore/federation/Makefile.am b/qpid/cpp/src/tests/legacystore/federation/Makefile.am
index c48e861a65..c48e861a65 100644
--- a/cpp/src/tests/legacystore/federation/Makefile.am
+++ b/qpid/cpp/src/tests/legacystore/federation/Makefile.am
diff --git a/cpp/src/tests/legacystore/federation/federation_tests_env.sh b/qpid/cpp/src/tests/legacystore/federation/federation_tests_env.sh
index bf75056444..bf75056444 100755
--- a/cpp/src/tests/legacystore/federation/federation_tests_env.sh
+++ b/qpid/cpp/src/tests/legacystore/federation/federation_tests_env.sh
diff --git a/cpp/src/tests/legacystore/federation/run_federation_sys_tests b/qpid/cpp/src/tests/legacystore/federation/run_federation_sys_tests
index 776f009c05..776f009c05 100755
--- a/cpp/src/tests/legacystore/federation/run_federation_sys_tests
+++ b/qpid/cpp/src/tests/legacystore/federation/run_federation_sys_tests
diff --git a/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests b/qpid/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests
index 012c8d8f18..012c8d8f18 100755
--- a/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests
+++ b/qpid/cpp/src/tests/legacystore/federation/run_long_federation_sys_tests
diff --git a/cpp/src/tests/legacystore/jrnl/_st_auto_expand.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_st_auto_expand.cpp
index fb5c1f1742..fb5c1f1742 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_auto_expand.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_auto_expand.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_st_basic.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_st_basic.cpp
index 4aa6d2e29f..4aa6d2e29f 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_basic.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_basic.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_st_basic_txn.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_st_basic_txn.cpp
index aa2d31c2ae..aa2d31c2ae 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_basic_txn.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_basic_txn.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_st_helper_fns.h b/qpid/cpp/src/tests/legacystore/jrnl/_st_helper_fns.h
index 923065dd11..923065dd11 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_helper_fns.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_helper_fns.h
diff --git a/cpp/src/tests/legacystore/jrnl/_st_read.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_st_read.cpp
index ff2c39e14c..ff2c39e14c 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_read.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_read.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_st_read_txn.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_st_read_txn.cpp
index 621777d8d3..621777d8d3 100644
--- a/cpp/src/tests/legacystore/jrnl/_st_read_txn.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_st_read_txn.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_enq_map.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_enq_map.cpp
index f05dcb824c..f05dcb824c 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_enq_map.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_enq_map.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_jdir.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jdir.cpp
index b55d5ff8ef..b55d5ff8ef 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_jdir.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jdir.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_jerrno.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jerrno.cpp
index 1ae1138355..1ae1138355 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_jerrno.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jerrno.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_jexception.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jexception.cpp
index 8b9e876aa6..8b9e876aa6 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_jexception.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jexception.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_jinf.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jinf.cpp
index f239139306..f239139306 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_jinf.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_jinf.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_lpmgr.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_lpmgr.cpp
index 2dc20ffa7c..2dc20ffa7c 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_lpmgr.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_lpmgr.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp
index 099e576bbd..099e576bbd 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_rec_hdr.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_time_ns.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_time_ns.cpp
index f1b53bb97b..f1b53bb97b 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_time_ns.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_time_ns.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/_ut_txn_map.cpp b/qpid/cpp/src/tests/legacystore/jrnl/_ut_txn_map.cpp
index 595ce0f6c6..595ce0f6c6 100644
--- a/cpp/src/tests/legacystore/jrnl/_ut_txn_map.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/_ut_txn_map.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/chk_jdata b/qpid/cpp/src/tests/legacystore/jrnl/chk_jdata
index 2ac87d91b9..2ac87d91b9 100755
--- a/cpp/src/tests/legacystore/jrnl/chk_jdata
+++ b/qpid/cpp/src/tests/legacystore/jrnl/chk_jdata
diff --git a/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl b/qpid/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl
index e21f991788..e21f991788 100755
--- a/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl
+++ b/qpid/cpp/src/tests/legacystore/jrnl/cp_rtest_jrnl
diff --git a/cpp/src/tests/legacystore/jrnl/jhexdump b/qpid/cpp/src/tests/legacystore/jrnl/jhexdump
index b013914441..b013914441 100755
--- a/cpp/src/tests/legacystore/jrnl/jhexdump
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jhexdump
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_data_src.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_data_src.cpp
index e4656ef83f..e4656ef83f 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_data_src.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_data_src.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_init_params.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_init_params.cpp
index 9fefe25105..9fefe25105 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_init_params.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_init_params.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_instance.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_instance.cpp
index 12f1c542d6..12f1c542d6 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_instance.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_jrnl_instance.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_read_arg.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_read_arg.cpp
index 0d2025270d..0d2025270d 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_read_arg.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_read_arg.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case.cpp
index 3a7d0f951c..3a7d0f951c 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result.cpp
index dd83dbee69..dd83dbee69 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result_agregation.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result_agregation.cpp
index aa01bf833d..aa01bf833d 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result_agregation.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_result_agregation.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.cpp
index adbdf6884b..adbdf6884b 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.csv b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.csv
index f886186275..f886186275 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.csv
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/_ut_test_case_set.csv
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/args.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/args.cpp
index 0f041c380e..0f041c380e 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/args.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/args.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/args.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/args.h
index b6f7fb4a79..b6f7fb4a79 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/args.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/args.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/data_src.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/data_src.cpp
index 3530e0b223..3530e0b223 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/data_src.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/data_src.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/data_src.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/data_src.h
index 66dc613787..66dc613787 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/data_src.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/data_src.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jfile_chk.py b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jfile_chk.py
index 36ef511f5c..36ef511f5c 100755
--- a/cpp/src/tests/legacystore/jrnl/jtt/jfile_chk.py
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jfile_chk.py
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.cpp
index 1bc04110af..1bc04110af 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.h
index ece87f8e03..ece87f8e03 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_init_params.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.cpp
index 339dc1b52c..339dc1b52c 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.h
index 5003f39b24..5003f39b24 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jrnl_instance.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/jtt.csv b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jtt.csv
index df523e3f97..df523e3f97 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/jtt.csv
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/jtt.csv
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/main.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/main.cpp
index c8a4642b1c..c8a4642b1c 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/main.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/main.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/read_arg.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/read_arg.cpp
index 94a07c7005..94a07c7005 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/read_arg.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/read_arg.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/read_arg.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/read_arg.h
index a8fd6f198e..a8fd6f198e 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/read_arg.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/read_arg.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case.cpp
index e06e053504..e06e053504 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case.h
index f72dd05f0c..f72dd05f0c 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.cpp
index 2f88f265a5..2f88f265a5 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.h
index d15f9d021d..d15f9d021d 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.cpp
index da439e71e8..da439e71e8 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.h
index 0b3998176c..0b3998176c 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_result_agregation.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.cpp
index b818d6c7ae..b818d6c7ae 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.h
index 94a1ee3172..94a1ee3172 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_case_set.h
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.cpp b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.cpp
index de0b5dbfb9..de0b5dbfb9 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.cpp
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.cpp
diff --git a/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.h b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.h
index e608ac6280..e608ac6280 100644
--- a/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.h
+++ b/qpid/cpp/src/tests/legacystore/jrnl/jtt/test_mgr.h
diff --git a/cpp/src/tests/legacystore/jrnl/prof b/qpid/cpp/src/tests/legacystore/jrnl/prof
index 2abe7baa4a..2abe7baa4a 100755
--- a/cpp/src/tests/legacystore/jrnl/prof
+++ b/qpid/cpp/src/tests/legacystore/jrnl/prof
diff --git a/cpp/src/tests/legacystore/jrnl/run-journal-tests b/qpid/cpp/src/tests/legacystore/jrnl/run-journal-tests
index e169e39c60..e169e39c60 100755
--- a/cpp/src/tests/legacystore/jrnl/run-journal-tests
+++ b/qpid/cpp/src/tests/legacystore/jrnl/run-journal-tests
diff --git a/cpp/src/tests/legacystore/jrnl/tests.ods b/qpid/cpp/src/tests/legacystore/jrnl/tests.ods
index d900374321..d900374321 100644
--- a/cpp/src/tests/legacystore/jrnl/tests.ods
+++ b/qpid/cpp/src/tests/legacystore/jrnl/tests.ods
diff --git a/cpp/src/tests/legacystore/persistence.py b/qpid/cpp/src/tests/legacystore/persistence.py
index c4ab712f14..c4ab712f14 100644
--- a/cpp/src/tests/legacystore/persistence.py
+++ b/qpid/cpp/src/tests/legacystore/persistence.py
diff --git a/cpp/src/tests/legacystore/python_tests/__init__.py b/qpid/cpp/src/tests/legacystore/python_tests/__init__.py
index ebb9da8670..ebb9da8670 100644
--- a/cpp/src/tests/legacystore/python_tests/__init__.py
+++ b/qpid/cpp/src/tests/legacystore/python_tests/__init__.py
diff --git a/cpp/src/tests/legacystore/python_tests/client_persistence.py b/qpid/cpp/src/tests/legacystore/python_tests/client_persistence.py
index 37c12601be..37c12601be 100644
--- a/cpp/src/tests/legacystore/python_tests/client_persistence.py
+++ b/qpid/cpp/src/tests/legacystore/python_tests/client_persistence.py
diff --git a/cpp/src/tests/legacystore/python_tests/resize.py b/qpid/cpp/src/tests/legacystore/python_tests/resize.py
index e719b755da..e719b755da 100644
--- a/cpp/src/tests/legacystore/python_tests/resize.py
+++ b/qpid/cpp/src/tests/legacystore/python_tests/resize.py
diff --git a/cpp/src/tests/legacystore/python_tests/store_test.py b/qpid/cpp/src/tests/legacystore/python_tests/store_test.py
index cc846aefd4..cc846aefd4 100644
--- a/cpp/src/tests/legacystore/python_tests/store_test.py
+++ b/qpid/cpp/src/tests/legacystore/python_tests/store_test.py
diff --git a/cpp/src/tests/legacystore/run_long_python_tests b/qpid/cpp/src/tests/legacystore/run_long_python_tests
index be6380302c..be6380302c 100644
--- a/cpp/src/tests/legacystore/run_long_python_tests
+++ b/qpid/cpp/src/tests/legacystore/run_long_python_tests
diff --git a/cpp/src/tests/legacystore/run_python_tests b/qpid/cpp/src/tests/legacystore/run_python_tests
index c1d04a28a1..c1d04a28a1 100755
--- a/cpp/src/tests/legacystore/run_python_tests
+++ b/qpid/cpp/src/tests/legacystore/run_python_tests
diff --git a/cpp/src/tests/legacystore/run_short_python_tests b/qpid/cpp/src/tests/legacystore/run_short_python_tests
index 9b9e7c59be..9b9e7c59be 100644
--- a/cpp/src/tests/legacystore/run_short_python_tests
+++ b/qpid/cpp/src/tests/legacystore/run_short_python_tests
diff --git a/cpp/src/tests/legacystore/system_test.sh b/qpid/cpp/src/tests/legacystore/system_test.sh
index 52cecbce8a..52cecbce8a 100644
--- a/cpp/src/tests/legacystore/system_test.sh
+++ b/qpid/cpp/src/tests/legacystore/system_test.sh
diff --git a/cpp/src/tests/legacystore/unit_test.cpp b/qpid/cpp/src/tests/legacystore/unit_test.cpp
index add80a6f91..add80a6f91 100644
--- a/cpp/src/tests/legacystore/unit_test.cpp
+++ b/qpid/cpp/src/tests/legacystore/unit_test.cpp
diff --git a/cpp/src/tests/legacystore/unit_test.h b/qpid/cpp/src/tests/legacystore/unit_test.h
index 16b6ae2ffb..16b6ae2ffb 100644
--- a/cpp/src/tests/legacystore/unit_test.h
+++ b/qpid/cpp/src/tests/legacystore/unit_test.h
diff --git a/cpp/src/tests/linearstore/CMakeLists.txt b/qpid/cpp/src/tests/linearstore/CMakeLists.txt
index bf6c164818..bf6c164818 100644
--- a/cpp/src/tests/linearstore/CMakeLists.txt
+++ b/qpid/cpp/src/tests/linearstore/CMakeLists.txt
diff --git a/cpp/src/tests/linearstore/linearstoredirsetup.sh b/qpid/cpp/src/tests/linearstore/linearstoredirsetup.sh
index ef39767e9b..ef39767e9b 100755
--- a/cpp/src/tests/linearstore/linearstoredirsetup.sh
+++ b/qpid/cpp/src/tests/linearstore/linearstoredirsetup.sh
diff --git a/cpp/src/tests/linearstore/python_tests/__init__.py b/qpid/cpp/src/tests/linearstore/python_tests/__init__.py
index 1e59d403e4..1e59d403e4 100644
--- a/cpp/src/tests/linearstore/python_tests/__init__.py
+++ b/qpid/cpp/src/tests/linearstore/python_tests/__init__.py
diff --git a/cpp/src/tests/linearstore/python_tests/client_persistence.py b/qpid/cpp/src/tests/linearstore/python_tests/client_persistence.py
index 9ff9480c4c..9ff9480c4c 100644
--- a/cpp/src/tests/linearstore/python_tests/client_persistence.py
+++ b/qpid/cpp/src/tests/linearstore/python_tests/client_persistence.py
diff --git a/cpp/src/tests/linearstore/python_tests/store_test.py b/qpid/cpp/src/tests/linearstore/python_tests/store_test.py
index cc846aefd4..cc846aefd4 100644
--- a/cpp/src/tests/linearstore/python_tests/store_test.py
+++ b/qpid/cpp/src/tests/linearstore/python_tests/store_test.py
diff --git a/cpp/src/tests/linearstore/run_long_python_tests b/qpid/cpp/src/tests/linearstore/run_long_python_tests
index be6380302c..be6380302c 100644
--- a/cpp/src/tests/linearstore/run_long_python_tests
+++ b/qpid/cpp/src/tests/linearstore/run_long_python_tests
diff --git a/cpp/src/tests/linearstore/run_python_tests b/qpid/cpp/src/tests/linearstore/run_python_tests
index 4ff212a71c..4ff212a71c 100755
--- a/cpp/src/tests/linearstore/run_python_tests
+++ b/qpid/cpp/src/tests/linearstore/run_python_tests
diff --git a/cpp/src/tests/linearstore/run_short_python_tests b/qpid/cpp/src/tests/linearstore/run_short_python_tests
index 9b9e7c59be..9b9e7c59be 100644
--- a/cpp/src/tests/linearstore/run_short_python_tests
+++ b/qpid/cpp/src/tests/linearstore/run_short_python_tests
diff --git a/cpp/src/tests/linearstore/tx-test-soak.sh b/qpid/cpp/src/tests/linearstore/tx-test-soak.sh
index 7d5581961f..7d5581961f 100755
--- a/cpp/src/tests/linearstore/tx-test-soak.sh
+++ b/qpid/cpp/src/tests/linearstore/tx-test-soak.sh
diff --git a/cpp/src/tests/logging.cpp b/qpid/cpp/src/tests/logging.cpp
index 32cd09d73d..32cd09d73d 100644
--- a/cpp/src/tests/logging.cpp
+++ b/qpid/cpp/src/tests/logging.cpp
diff --git a/cpp/src/tests/misc.py b/qpid/cpp/src/tests/misc.py
index 257fb9e754..257fb9e754 100644
--- a/cpp/src/tests/misc.py
+++ b/qpid/cpp/src/tests/misc.py
diff --git a/cpp/src/tests/msg_group_test.cpp b/qpid/cpp/src/tests/msg_group_test.cpp
index ca87197ff3..ca87197ff3 100644
--- a/cpp/src/tests/msg_group_test.cpp
+++ b/qpid/cpp/src/tests/msg_group_test.cpp
diff --git a/cpp/src/tests/multiq_perftest b/qpid/cpp/src/tests/multiq_perftest
index 9673dd2e6d..9673dd2e6d 100755
--- a/cpp/src/tests/multiq_perftest
+++ b/qpid/cpp/src/tests/multiq_perftest
diff --git a/cpp/src/tests/perfdist b/qpid/cpp/src/tests/perfdist
index 4049b410ff..4049b410ff 100755
--- a/cpp/src/tests/perfdist
+++ b/qpid/cpp/src/tests/perfdist
diff --git a/cpp/src/tests/ping_broker b/qpid/cpp/src/tests/ping_broker
index bdf48f3358..bdf48f3358 100755
--- a/cpp/src/tests/ping_broker
+++ b/qpid/cpp/src/tests/ping_broker
diff --git a/cpp/src/tests/policies.py b/qpid/cpp/src/tests/policies.py
index ec0191f91e..ec0191f91e 100644
--- a/cpp/src/tests/policies.py
+++ b/qpid/cpp/src/tests/policies.py
diff --git a/cpp/src/tests/policy.acl b/qpid/cpp/src/tests/policy.acl
index 4c13ac75c1..4c13ac75c1 100644
--- a/cpp/src/tests/policy.acl
+++ b/qpid/cpp/src/tests/policy.acl
diff --git a/cpp/src/tests/publish.cpp b/qpid/cpp/src/tests/publish.cpp
index 3f456e7588..3f456e7588 100644
--- a/cpp/src/tests/publish.cpp
+++ b/qpid/cpp/src/tests/publish.cpp
diff --git a/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests
index a36839a43c..a36839a43c 100755
--- a/cpp/src/tests/python_tests
+++ b/qpid/cpp/src/tests/python_tests
diff --git a/cpp/src/tests/python_tests.ps1 b/qpid/cpp/src/tests/python_tests.ps1
index f7caa8f75a..f7caa8f75a 100644
--- a/cpp/src/tests/python_tests.ps1
+++ b/qpid/cpp/src/tests/python_tests.ps1
diff --git a/cpp/src/tests/qpid-analyze-trace b/qpid/cpp/src/tests/qpid-analyze-trace
index 009fbc441c..009fbc441c 100755
--- a/cpp/src/tests/qpid-analyze-trace
+++ b/qpid/cpp/src/tests/qpid-analyze-trace
diff --git a/cpp/src/tests/qpid-build-rinstall b/qpid/cpp/src/tests/qpid-build-rinstall
index beff7dffba..beff7dffba 100755
--- a/cpp/src/tests/qpid-build-rinstall
+++ b/qpid/cpp/src/tests/qpid-build-rinstall
diff --git a/cpp/src/tests/qpid-client-test.cpp b/qpid/cpp/src/tests/qpid-client-test.cpp
index 9198324f93..9198324f93 100644
--- a/cpp/src/tests/qpid-client-test.cpp
+++ b/qpid/cpp/src/tests/qpid-client-test.cpp
diff --git a/cpp/src/tests/qpid-cluster-benchmark b/qpid/cpp/src/tests/qpid-cluster-benchmark
index f20ac6ac30..f20ac6ac30 100755
--- a/cpp/src/tests/qpid-cluster-benchmark
+++ b/qpid/cpp/src/tests/qpid-cluster-benchmark
diff --git a/cpp/src/tests/qpid-cpp-benchmark b/qpid/cpp/src/tests/qpid-cpp-benchmark
index 2d5ec711fe..2d5ec711fe 100755
--- a/cpp/src/tests/qpid-cpp-benchmark
+++ b/qpid/cpp/src/tests/qpid-cpp-benchmark
diff --git a/cpp/src/tests/qpid-ctrl b/qpid/cpp/src/tests/qpid-ctrl
index 4246c57898..4246c57898 100755
--- a/cpp/src/tests/qpid-ctrl
+++ b/qpid/cpp/src/tests/qpid-ctrl
diff --git a/cpp/src/tests/qpid-latency-test.cpp b/qpid/cpp/src/tests/qpid-latency-test.cpp
index a03963467b..a03963467b 100644
--- a/cpp/src/tests/qpid-latency-test.cpp
+++ b/qpid/cpp/src/tests/qpid-latency-test.cpp
diff --git a/cpp/src/tests/qpid-perftest.cpp b/qpid/cpp/src/tests/qpid-perftest.cpp
index 7b9738772c..7b9738772c 100644
--- a/cpp/src/tests/qpid-perftest.cpp
+++ b/qpid/cpp/src/tests/qpid-perftest.cpp
diff --git a/cpp/src/tests/qpid-ping.cpp b/qpid/cpp/src/tests/qpid-ping.cpp
index 40e6a0f671..40e6a0f671 100644
--- a/cpp/src/tests/qpid-ping.cpp
+++ b/qpid/cpp/src/tests/qpid-ping.cpp
diff --git a/cpp/src/tests/qpid-receive.cpp b/qpid/cpp/src/tests/qpid-receive.cpp
index a71fd11fa7..a71fd11fa7 100644
--- a/cpp/src/tests/qpid-receive.cpp
+++ b/qpid/cpp/src/tests/qpid-receive.cpp
diff --git a/cpp/src/tests/qpid-send.cpp b/qpid/cpp/src/tests/qpid-send.cpp
index bc0ad78601..bc0ad78601 100644
--- a/cpp/src/tests/qpid-send.cpp
+++ b/qpid/cpp/src/tests/qpid-send.cpp
diff --git a/cpp/src/tests/qpid-src-rinstall b/qpid/cpp/src/tests/qpid-src-rinstall
index c7473e9197..c7473e9197 100755
--- a/cpp/src/tests/qpid-src-rinstall
+++ b/qpid/cpp/src/tests/qpid-src-rinstall
diff --git a/cpp/src/tests/qpid-stream.cpp b/qpid/cpp/src/tests/qpid-stream.cpp
index f02a484750..f02a484750 100644
--- a/cpp/src/tests/qpid-stream.cpp
+++ b/qpid/cpp/src/tests/qpid-stream.cpp
diff --git a/cpp/src/tests/qpid-topic-listener.cpp b/qpid/cpp/src/tests/qpid-topic-listener.cpp
index c42e76d760..c42e76d760 100644
--- a/cpp/src/tests/qpid-topic-listener.cpp
+++ b/qpid/cpp/src/tests/qpid-topic-listener.cpp
diff --git a/cpp/src/tests/qpid-topic-publisher.cpp b/qpid/cpp/src/tests/qpid-topic-publisher.cpp
index f9107b90d0..f9107b90d0 100644
--- a/cpp/src/tests/qpid-topic-publisher.cpp
+++ b/qpid/cpp/src/tests/qpid-topic-publisher.cpp
diff --git a/cpp/src/tests/qpid-txtest.cpp b/qpid/cpp/src/tests/qpid-txtest.cpp
index 59ab905af7..59ab905af7 100644
--- a/cpp/src/tests/qpid-txtest.cpp
+++ b/qpid/cpp/src/tests/qpid-txtest.cpp
diff --git a/cpp/src/tests/qpid-txtest2.cpp b/qpid/cpp/src/tests/qpid-txtest2.cpp
index 58c48f9a8d..58c48f9a8d 100644
--- a/cpp/src/tests/qpid-txtest2.cpp
+++ b/qpid/cpp/src/tests/qpid-txtest2.cpp
diff --git a/cpp/src/tests/qpidd-empty.conf b/qpid/cpp/src/tests/qpidd-empty.conf
index cf3f19fba0..cf3f19fba0 100644
--- a/cpp/src/tests/qpidd-empty.conf
+++ b/qpid/cpp/src/tests/qpidd-empty.conf
diff --git a/cpp/src/tests/qpidd-p0 b/qpid/cpp/src/tests/qpidd-p0
index 1f7807afd2..1f7807afd2 100755
--- a/cpp/src/tests/qpidd-p0
+++ b/qpid/cpp/src/tests/qpidd-p0
diff --git a/cpp/src/tests/qpidd_qmfv2_tests.py b/qpid/cpp/src/tests/qpidd_qmfv2_tests.py
index 2b45cb6eea..2b45cb6eea 100755
--- a/cpp/src/tests/qpidd_qmfv2_tests.py
+++ b/qpid/cpp/src/tests/qpidd_qmfv2_tests.py
diff --git a/cpp/src/tests/queue_flow_limit_tests.py b/qpid/cpp/src/tests/queue_flow_limit_tests.py
index 83e31e979b..83e31e979b 100644
--- a/cpp/src/tests/queue_flow_limit_tests.py
+++ b/qpid/cpp/src/tests/queue_flow_limit_tests.py
diff --git a/cpp/src/tests/queue_redirect.py b/qpid/cpp/src/tests/queue_redirect.py
index 8a7b4c244b..8a7b4c244b 100644
--- a/cpp/src/tests/queue_redirect.py
+++ b/qpid/cpp/src/tests/queue_redirect.py
diff --git a/cpp/src/tests/quick_perftest b/qpid/cpp/src/tests/quick_perftest
index 698af60324..698af60324 100755
--- a/cpp/src/tests/quick_perftest
+++ b/qpid/cpp/src/tests/quick_perftest
diff --git a/cpp/src/tests/quick_topictest b/qpid/cpp/src/tests/quick_topictest
index e44ec0f477..e44ec0f477 100755
--- a/cpp/src/tests/quick_topictest
+++ b/qpid/cpp/src/tests/quick_topictest
diff --git a/cpp/src/tests/quick_topictest.ps1 b/qpid/cpp/src/tests/quick_topictest.ps1
index 8f5b2caff7..8f5b2caff7 100644
--- a/cpp/src/tests/quick_topictest.ps1
+++ b/qpid/cpp/src/tests/quick_topictest.ps1
diff --git a/cpp/src/tests/quick_txtest b/qpid/cpp/src/tests/quick_txtest
index 77e8556f1d..77e8556f1d 100755
--- a/cpp/src/tests/quick_txtest
+++ b/qpid/cpp/src/tests/quick_txtest
diff --git a/cpp/src/tests/receiver.cpp b/qpid/cpp/src/tests/receiver.cpp
index f1b462d6e4..f1b462d6e4 100644
--- a/cpp/src/tests/receiver.cpp
+++ b/qpid/cpp/src/tests/receiver.cpp
diff --git a/cpp/src/tests/reject_release.py b/qpid/cpp/src/tests/reject_release.py
index d072b8aa78..d072b8aa78 100644
--- a/cpp/src/tests/reject_release.py
+++ b/qpid/cpp/src/tests/reject_release.py
diff --git a/cpp/src/tests/replaying_sender.cpp b/qpid/cpp/src/tests/replaying_sender.cpp
index a5549bfdf2..a5549bfdf2 100644
--- a/cpp/src/tests/replaying_sender.cpp
+++ b/qpid/cpp/src/tests/replaying_sender.cpp
diff --git a/cpp/src/tests/resuming_receiver.cpp b/qpid/cpp/src/tests/resuming_receiver.cpp
index 2e22a7c572..2e22a7c572 100644
--- a/cpp/src/tests/resuming_receiver.cpp
+++ b/qpid/cpp/src/tests/resuming_receiver.cpp
diff --git a/cpp/src/tests/ring_queue_test b/qpid/cpp/src/tests/ring_queue_test
index 410ea30eb8..410ea30eb8 100755
--- a/cpp/src/tests/ring_queue_test
+++ b/qpid/cpp/src/tests/ring_queue_test
diff --git a/cpp/src/tests/rsynchosts b/qpid/cpp/src/tests/rsynchosts
index 10e1081f76..10e1081f76 100755
--- a/cpp/src/tests/rsynchosts
+++ b/qpid/cpp/src/tests/rsynchosts
diff --git a/cpp/src/tests/run_acl_tests b/qpid/cpp/src/tests/run_acl_tests
index 4bb9e7aa5d..4bb9e7aa5d 100755
--- a/cpp/src/tests/run_acl_tests
+++ b/qpid/cpp/src/tests/run_acl_tests
diff --git a/cpp/src/tests/run_acl_tests.ps1 b/qpid/cpp/src/tests/run_acl_tests.ps1
index 8279d87e54..8279d87e54 100644
--- a/cpp/src/tests/run_acl_tests.ps1
+++ b/qpid/cpp/src/tests/run_acl_tests.ps1
diff --git a/cpp/src/tests/run_cli_tests b/qpid/cpp/src/tests/run_cli_tests
index 1db99001a4..1db99001a4 100755
--- a/cpp/src/tests/run_cli_tests
+++ b/qpid/cpp/src/tests/run_cli_tests
diff --git a/cpp/src/tests/run_federation_sys_tests b/qpid/cpp/src/tests/run_federation_sys_tests
index f5f1ae44d3..f5f1ae44d3 100755
--- a/cpp/src/tests/run_federation_sys_tests
+++ b/qpid/cpp/src/tests/run_federation_sys_tests
diff --git a/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests
index 8cadd3702f..8cadd3702f 100755
--- a/cpp/src/tests/run_federation_tests
+++ b/qpid/cpp/src/tests/run_federation_tests
diff --git a/cpp/src/tests/run_federation_tests.ps1 b/qpid/cpp/src/tests/run_federation_tests.ps1
index 803b3eef6f..803b3eef6f 100644
--- a/cpp/src/tests/run_federation_tests.ps1
+++ b/qpid/cpp/src/tests/run_federation_tests.ps1
diff --git a/cpp/src/tests/run_ha_tests b/qpid/cpp/src/tests/run_ha_tests
index bb60bea076..bb60bea076 100755
--- a/cpp/src/tests/run_ha_tests
+++ b/qpid/cpp/src/tests/run_ha_tests
diff --git a/cpp/src/tests/run_header_test b/qpid/cpp/src/tests/run_header_test
index d1edcf6831..d1edcf6831 100755
--- a/cpp/src/tests/run_header_test
+++ b/qpid/cpp/src/tests/run_header_test
diff --git a/cpp/src/tests/run_header_test.ps1 b/qpid/cpp/src/tests/run_header_test.ps1
index 344fac9cf9..344fac9cf9 100644
--- a/cpp/src/tests/run_header_test.ps1
+++ b/qpid/cpp/src/tests/run_header_test.ps1
diff --git a/cpp/src/tests/run_headers_federation_tests b/qpid/cpp/src/tests/run_headers_federation_tests
index afbbf144ee..afbbf144ee 100644
--- a/cpp/src/tests/run_headers_federation_tests
+++ b/qpid/cpp/src/tests/run_headers_federation_tests
diff --git a/cpp/src/tests/run_interlink_tests b/qpid/cpp/src/tests/run_interlink_tests
index 71482fa7fd..71482fa7fd 100755
--- a/cpp/src/tests/run_interlink_tests
+++ b/qpid/cpp/src/tests/run_interlink_tests
diff --git a/cpp/src/tests/run_long_federation_sys_tests b/qpid/cpp/src/tests/run_long_federation_sys_tests
index c2b4e02d81..c2b4e02d81 100644
--- a/cpp/src/tests/run_long_federation_sys_tests
+++ b/qpid/cpp/src/tests/run_long_federation_sys_tests
diff --git a/cpp/src/tests/run_msg_group_tests b/qpid/cpp/src/tests/run_msg_group_tests
index ee479c23c7..ee479c23c7 100755
--- a/cpp/src/tests/run_msg_group_tests
+++ b/qpid/cpp/src/tests/run_msg_group_tests
diff --git a/cpp/src/tests/run_msg_group_tests.ps1 b/qpid/cpp/src/tests/run_msg_group_tests.ps1
index e9cee0a5a0..e9cee0a5a0 100644
--- a/cpp/src/tests/run_msg_group_tests.ps1
+++ b/qpid/cpp/src/tests/run_msg_group_tests.ps1
diff --git a/cpp/src/tests/run_msg_group_tests_soak b/qpid/cpp/src/tests/run_msg_group_tests_soak
index d87ca16c88..d87ca16c88 100755
--- a/cpp/src/tests/run_msg_group_tests_soak
+++ b/qpid/cpp/src/tests/run_msg_group_tests_soak
diff --git a/cpp/src/tests/run_paged_queue_tests b/qpid/cpp/src/tests/run_paged_queue_tests
index 2c1e3ae614..2c1e3ae614 100755
--- a/cpp/src/tests/run_paged_queue_tests
+++ b/qpid/cpp/src/tests/run_paged_queue_tests
diff --git a/cpp/src/tests/run_perftest b/qpid/cpp/src/tests/run_perftest
index 2fadc6cc62..2fadc6cc62 100755
--- a/cpp/src/tests/run_perftest
+++ b/qpid/cpp/src/tests/run_perftest
diff --git a/cpp/src/tests/run_queue_flow_limit_tests b/qpid/cpp/src/tests/run_queue_flow_limit_tests
index 55b3e5d4c5..55b3e5d4c5 100755
--- a/cpp/src/tests/run_queue_flow_limit_tests
+++ b/qpid/cpp/src/tests/run_queue_flow_limit_tests
diff --git a/cpp/src/tests/run_queue_redirect b/qpid/cpp/src/tests/run_queue_redirect
index 3a0ae5118a..3a0ae5118a 100755
--- a/cpp/src/tests/run_queue_redirect
+++ b/qpid/cpp/src/tests/run_queue_redirect
diff --git a/cpp/src/tests/run_ring_queue_test b/qpid/cpp/src/tests/run_ring_queue_test
index 69497f9872..69497f9872 100755
--- a/cpp/src/tests/run_ring_queue_test
+++ b/qpid/cpp/src/tests/run_ring_queue_test
diff --git a/cpp/src/tests/run_store_tests.ps1 b/qpid/cpp/src/tests/run_store_tests.ps1
index 0683892393..0683892393 100644
--- a/cpp/src/tests/run_store_tests.ps1
+++ b/qpid/cpp/src/tests/run_store_tests.ps1
diff --git a/cpp/src/tests/run_test b/qpid/cpp/src/tests/run_test
index 8e397b3458..8e397b3458 100755
--- a/cpp/src/tests/run_test
+++ b/qpid/cpp/src/tests/run_test
diff --git a/cpp/src/tests/run_test.ps1 b/qpid/cpp/src/tests/run_test.ps1
index ff103e4556..ff103e4556 100644
--- a/cpp/src/tests/run_test.ps1
+++ b/qpid/cpp/src/tests/run_test.ps1
diff --git a/cpp/src/tests/sasl_fed b/qpid/cpp/src/tests/sasl_fed
index 38ef43f56f..38ef43f56f 100755
--- a/cpp/src/tests/sasl_fed
+++ b/qpid/cpp/src/tests/sasl_fed
diff --git a/cpp/src/tests/sasl_fed_ex b/qpid/cpp/src/tests/sasl_fed_ex
index e2ee37ba39..e2ee37ba39 100755
--- a/cpp/src/tests/sasl_fed_ex
+++ b/qpid/cpp/src/tests/sasl_fed_ex
diff --git a/cpp/src/tests/sasl_no_dir b/qpid/cpp/src/tests/sasl_no_dir
index b2f5d1668e..b2f5d1668e 100755
--- a/cpp/src/tests/sasl_no_dir
+++ b/qpid/cpp/src/tests/sasl_no_dir
diff --git a/cpp/src/tests/sasl_test_setup.sh b/qpid/cpp/src/tests/sasl_test_setup.sh
index d41efbe6e5..d41efbe6e5 100755
--- a/cpp/src/tests/sasl_test_setup.sh
+++ b/qpid/cpp/src/tests/sasl_test_setup.sh
diff --git a/cpp/src/tests/sasl_version.cpp b/qpid/cpp/src/tests/sasl_version.cpp
index db3efe4181..db3efe4181 100644
--- a/cpp/src/tests/sasl_version.cpp
+++ b/qpid/cpp/src/tests/sasl_version.cpp
diff --git a/cpp/src/tests/sender.cpp b/qpid/cpp/src/tests/sender.cpp
index 063b5e87dc..063b5e87dc 100644
--- a/cpp/src/tests/sender.cpp
+++ b/qpid/cpp/src/tests/sender.cpp
diff --git a/cpp/src/tests/shared_perftest b/qpid/cpp/src/tests/shared_perftest
index 709ffd56b5..709ffd56b5 100755
--- a/cpp/src/tests/shared_perftest
+++ b/qpid/cpp/src/tests/shared_perftest
diff --git a/cpp/src/tests/shlibtest.cpp b/qpid/cpp/src/tests/shlibtest.cpp
index 5655eb7e64..5655eb7e64 100644
--- a/cpp/src/tests/shlibtest.cpp
+++ b/qpid/cpp/src/tests/shlibtest.cpp
diff --git a/cpp/src/tests/ssl_test b/qpid/cpp/src/tests/ssl_test
index d681059495..d681059495 100755
--- a/cpp/src/tests/ssl_test
+++ b/qpid/cpp/src/tests/ssl_test
diff --git a/cpp/src/tests/store.py b/qpid/cpp/src/tests/store.py
index 5c1934dded..5c1934dded 100755
--- a/cpp/src/tests/store.py
+++ b/qpid/cpp/src/tests/store.py
diff --git a/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests
index 40c35ac0fa..40c35ac0fa 100755
--- a/cpp/src/tests/swig_python_tests
+++ b/qpid/cpp/src/tests/swig_python_tests
diff --git a/cpp/src/tests/test.xquery b/qpid/cpp/src/tests/test.xquery
index 4cfe3af02d..4cfe3af02d 100644
--- a/cpp/src/tests/test.xquery
+++ b/qpid/cpp/src/tests/test.xquery
diff --git a/cpp/src/tests/test_env.ps1.in b/qpid/cpp/src/tests/test_env.ps1.in
index 94834a4b5e..94834a4b5e 100644
--- a/cpp/src/tests/test_env.ps1.in
+++ b/qpid/cpp/src/tests/test_env.ps1.in
diff --git a/cpp/src/tests/test_env.sh.in b/qpid/cpp/src/tests/test_env.sh.in
index 1c4c117e4b..1c4c117e4b 100644
--- a/cpp/src/tests/test_env.sh.in
+++ b/qpid/cpp/src/tests/test_env.sh.in
diff --git a/cpp/src/tests/test_env_common.sh b/qpid/cpp/src/tests/test_env_common.sh
index 348664ca76..348664ca76 100644
--- a/cpp/src/tests/test_env_common.sh
+++ b/qpid/cpp/src/tests/test_env_common.sh
diff --git a/cpp/src/tests/test_store.cpp b/qpid/cpp/src/tests/test_store.cpp
index 14aee7b648..14aee7b648 100644
--- a/cpp/src/tests/test_store.cpp
+++ b/qpid/cpp/src/tests/test_store.cpp
diff --git a/cpp/src/tests/test_tools.h b/qpid/cpp/src/tests/test_tools.h
index d006246299..d006246299 100644
--- a/cpp/src/tests/test_tools.h
+++ b/qpid/cpp/src/tests/test_tools.h
diff --git a/cpp/src/tests/topic_perftest b/qpid/cpp/src/tests/topic_perftest
index 04e1cdcffb..04e1cdcffb 100755
--- a/cpp/src/tests/topic_perftest
+++ b/qpid/cpp/src/tests/topic_perftest
diff --git a/cpp/src/tests/topictest b/qpid/cpp/src/tests/topictest
index f4c6e7187d..f4c6e7187d 100755
--- a/cpp/src/tests/topictest
+++ b/qpid/cpp/src/tests/topictest
diff --git a/cpp/src/tests/topictest.ps1 b/qpid/cpp/src/tests/topictest.ps1
index f15b2d452c..f15b2d452c 100644
--- a/cpp/src/tests/topictest.ps1
+++ b/qpid/cpp/src/tests/topictest.ps1
diff --git a/cpp/src/tests/txjob.cpp b/qpid/cpp/src/tests/txjob.cpp
index 29394c3415..29394c3415 100644
--- a/cpp/src/tests/txjob.cpp
+++ b/qpid/cpp/src/tests/txjob.cpp
diff --git a/cpp/src/tests/txshift.cpp b/qpid/cpp/src/tests/txshift.cpp
index 6ec28c7233..6ec28c7233 100644
--- a/cpp/src/tests/txshift.cpp
+++ b/qpid/cpp/src/tests/txshift.cpp
diff --git a/cpp/src/tests/unit_test.cpp b/qpid/cpp/src/tests/unit_test.cpp
index 00c61242e4..00c61242e4 100644
--- a/cpp/src/tests/unit_test.cpp
+++ b/qpid/cpp/src/tests/unit_test.cpp
diff --git a/cpp/src/tests/unit_test.h b/qpid/cpp/src/tests/unit_test.h
index a11df2ff04..a11df2ff04 100644
--- a/cpp/src/tests/unit_test.h
+++ b/qpid/cpp/src/tests/unit_test.h
diff --git a/cpp/src/tests/vg_check b/qpid/cpp/src/tests/vg_check
index 462f4cb5e4..462f4cb5e4 100644
--- a/cpp/src/tests/vg_check
+++ b/qpid/cpp/src/tests/vg_check
diff --git a/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp b/qpid/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
index 14f1e46606..14f1e46606 100644
--- a/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
+++ b/qpid/cpp/src/tests/windows/DisableWin32ErrorWindows.cpp
diff --git a/cpp/src/versions.cmake b/qpid/cpp/src/versions.cmake
index ac20e9ed7f..ac20e9ed7f 100644
--- a/cpp/src/versions.cmake
+++ b/qpid/cpp/src/versions.cmake
diff --git a/cpp/src/windows/QpiddBroker.cpp b/qpid/cpp/src/windows/QpiddBroker.cpp
index b383b7d6c7..b383b7d6c7 100644
--- a/cpp/src/windows/QpiddBroker.cpp
+++ b/qpid/cpp/src/windows/QpiddBroker.cpp
diff --git a/cpp/src/windows/SCM.cpp b/qpid/cpp/src/windows/SCM.cpp
index 2eeb143427..2eeb143427 100644
--- a/cpp/src/windows/SCM.cpp
+++ b/qpid/cpp/src/windows/SCM.cpp
diff --git a/cpp/src/windows/SCM.h b/qpid/cpp/src/windows/SCM.h
index bdc73bc210..bdc73bc210 100644
--- a/cpp/src/windows/SCM.h
+++ b/qpid/cpp/src/windows/SCM.h
diff --git a/cpp/src/windows/resources/qpid-icon.ico b/qpid/cpp/src/windows/resources/qpid-icon.ico
index 112f5d8f1f..112f5d8f1f 100644
--- a/cpp/src/windows/resources/qpid-icon.ico
+++ b/qpid/cpp/src/windows/resources/qpid-icon.ico
diff --git a/cpp/src/windows/resources/template-resource.rc b/qpid/cpp/src/windows/resources/template-resource.rc
index 8ca0a90890..8ca0a90890 100644
--- a/cpp/src/windows/resources/template-resource.rc
+++ b/qpid/cpp/src/windows/resources/template-resource.rc
diff --git a/cpp/src/windows/resources/version-resource.h b/qpid/cpp/src/windows/resources/version-resource.h
index bf942abbaf..bf942abbaf 100644
--- a/cpp/src/windows/resources/version-resource.h
+++ b/qpid/cpp/src/windows/resources/version-resource.h
diff --git a/doc/book/.gitignore b/qpid/doc/book/.gitignore
index 21f1f20096..21f1f20096 100644
--- a/doc/book/.gitignore
+++ b/qpid/doc/book/.gitignore
diff --git a/doc/book/Makefile b/qpid/doc/book/Makefile
index 6e97a0c5cc..6e97a0c5cc 100644
--- a/doc/book/Makefile
+++ b/qpid/doc/book/Makefile
diff --git a/doc/book/src/Makefile.inc b/qpid/doc/book/src/Makefile.inc
index 4de5733740..4de5733740 100644
--- a/doc/book/src/Makefile.inc
+++ b/qpid/doc/book/src/Makefile.inc
diff --git a/doc/book/src/common/css/style.css b/qpid/doc/book/src/common/css/style.css
index c681596592..c681596592 100644
--- a/doc/book/src/common/css/style.css
+++ b/qpid/doc/book/src/common/css/style.css
diff --git a/doc/book/src/cpp-broker/.gitignore b/qpid/doc/book/src/cpp-broker/.gitignore
index 6d31bdba7f..6d31bdba7f 100644
--- a/doc/book/src/cpp-broker/.gitignore
+++ b/qpid/doc/book/src/cpp-broker/.gitignore
diff --git a/doc/book/src/cpp-broker/AMQP-Compatibility.xml b/qpid/doc/book/src/cpp-broker/AMQP-Compatibility.xml
index e5aa98cf96..e5aa98cf96 100644
--- a/doc/book/src/cpp-broker/AMQP-Compatibility.xml
+++ b/qpid/doc/book/src/cpp-broker/AMQP-Compatibility.xml
diff --git a/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml b/qpid/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml
index 6122b12e18..6122b12e18 100644
--- a/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml
+++ b/qpid/doc/book/src/cpp-broker/AMQP-Messaging-Broker-CPP-Book.xml
diff --git a/doc/book/src/cpp-broker/Active-Passive-Cluster.xml b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
index 461b75d320..461b75d320 100644
--- a/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
+++ b/qpid/doc/book/src/cpp-broker/Active-Passive-Cluster.xml
diff --git a/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml
index fccdae1b9a..fccdae1b9a 100644
--- a/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml
+++ b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Exchange-Options.xml
diff --git a/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
index 125372e463..125372e463 100644
--- a/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
+++ b/qpid/doc/book/src/cpp-broker/Cheat-Sheet-for-configuring-Queue-Options.xml
diff --git a/doc/book/src/cpp-broker/HA-Queue-Replication.xml b/qpid/doc/book/src/cpp-broker/HA-Queue-Replication.xml
index 81b55a3914..81b55a3914 100644
--- a/doc/book/src/cpp-broker/HA-Queue-Replication.xml
+++ b/qpid/doc/book/src/cpp-broker/HA-Queue-Replication.xml
diff --git a/doc/book/src/cpp-broker/LVQ.xml b/qpid/doc/book/src/cpp-broker/LVQ.xml
index b57c6268be..b57c6268be 100644
--- a/doc/book/src/cpp-broker/LVQ.xml
+++ b/qpid/doc/book/src/cpp-broker/LVQ.xml
diff --git a/doc/book/src/cpp-broker/Makefile b/qpid/doc/book/src/cpp-broker/Makefile
index 0266a0f54d..0266a0f54d 100644
--- a/doc/book/src/cpp-broker/Makefile
+++ b/qpid/doc/book/src/cpp-broker/Makefile
diff --git a/doc/book/src/cpp-broker/Managing-CPP-Broker.xml b/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
index ab72bf286b..ab72bf286b 100644
--- a/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
+++ b/qpid/doc/book/src/cpp-broker/Managing-CPP-Broker.xml
diff --git a/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml b/qpid/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml
index 2cb802671b..2cb802671b 100644
--- a/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml
+++ b/qpid/doc/book/src/cpp-broker/QMF-Python-Console-Tutorial.xml
diff --git a/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml b/qpid/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml
index 74546693df..74546693df 100644
--- a/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml
+++ b/qpid/doc/book/src/cpp-broker/Qpid-Interoperability-Documentation.xml
diff --git a/doc/book/src/cpp-broker/Qpid-Management-Framework.xml b/qpid/doc/book/src/cpp-broker/Qpid-Management-Framework.xml
index 89bfe9d95e..89bfe9d95e 100644
--- a/doc/book/src/cpp-broker/Qpid-Management-Framework.xml
+++ b/qpid/doc/book/src/cpp-broker/Qpid-Management-Framework.xml
diff --git a/doc/book/src/cpp-broker/Running-CPP-Broker.xml b/qpid/doc/book/src/cpp-broker/Running-CPP-Broker.xml
index 7f76cbc354..7f76cbc354 100644
--- a/doc/book/src/cpp-broker/Running-CPP-Broker.xml
+++ b/qpid/doc/book/src/cpp-broker/Running-CPP-Broker.xml
diff --git a/doc/book/src/cpp-broker/Security.xml b/qpid/doc/book/src/cpp-broker/Security.xml
index 8f42e6abdf..8f42e6abdf 100644
--- a/doc/book/src/cpp-broker/Security.xml
+++ b/qpid/doc/book/src/cpp-broker/Security.xml
diff --git a/doc/book/src/cpp-broker/Using-Broker-Federation.xml b/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml
index 614c168704..614c168704 100644
--- a/doc/book/src/cpp-broker/Using-Broker-Federation.xml
+++ b/qpid/doc/book/src/cpp-broker/Using-Broker-Federation.xml
diff --git a/doc/book/src/cpp-broker/Using-message-groups.xml b/qpid/doc/book/src/cpp-broker/Using-message-groups.xml
index 9b904d9f18..9b904d9f18 100644
--- a/doc/book/src/cpp-broker/Using-message-groups.xml
+++ b/qpid/doc/book/src/cpp-broker/Using-message-groups.xml
diff --git a/doc/book/src/cpp-broker/producer-flow-control.xml b/qpid/doc/book/src/cpp-broker/producer-flow-control.xml
index fd44f51e81..fd44f51e81 100644
--- a/doc/book/src/cpp-broker/producer-flow-control.xml
+++ b/qpid/doc/book/src/cpp-broker/producer-flow-control.xml
diff --git a/doc/book/src/cpp-broker/queue-state-replication.xml b/qpid/doc/book/src/cpp-broker/queue-state-replication.xml
index 3ffac805eb..3ffac805eb 100644
--- a/doc/book/src/cpp-broker/queue-state-replication.xml
+++ b/qpid/doc/book/src/cpp-broker/queue-state-replication.xml
diff --git a/doc/book/src/images/qpid-logo.png b/qpid/doc/book/src/images/qpid-logo.png
index 5f4ccc3081..5f4ccc3081 100644
--- a/doc/book/src/images/qpid-logo.png
+++ b/qpid/doc/book/src/images/qpid-logo.png
diff --git a/doc/book/src/old/ACL.xml b/qpid/doc/book/src/old/ACL.xml
index ceb7cecb23..ceb7cecb23 100644
--- a/doc/book/src/old/ACL.xml
+++ b/qpid/doc/book/src/old/ACL.xml
diff --git a/doc/book/src/old/AMQP-.NET-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-.NET-Messaging-Client.xml
index 1d4001942b..1d4001942b 100644
--- a/doc/book/src/old/AMQP-.NET-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-.NET-Messaging-Client.xml
diff --git a/doc/book/src/old/AMQP-C++-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-C++-Messaging-Client.xml
index 73a2cd6c0b..73a2cd6c0b 100644
--- a/doc/book/src/old/AMQP-C++-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-C++-Messaging-Client.xml
diff --git a/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml
index 8c14d67e14..8c14d67e14 100644
--- a/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-Java-JMS-Messaging-Client.xml
diff --git a/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml b/qpid/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml
index b4e0deb13d..b4e0deb13d 100644
--- a/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml
+++ b/qpid/doc/book/src/old/AMQP-Messaging-Broker-CPP.xml
diff --git a/doc/book/src/old/AMQP-Python-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-Python-Messaging-Client.xml
index 15baf214ec..15baf214ec 100644
--- a/doc/book/src/old/AMQP-Python-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-Python-Messaging-Client.xml
diff --git a/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml b/qpid/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml
index 45318c0beb..45318c0beb 100644
--- a/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml
+++ b/qpid/doc/book/src/old/AMQP-Ruby-Messaging-Client.xml
diff --git a/doc/book/src/old/AMQP.xml b/qpid/doc/book/src/old/AMQP.xml
index 1a609649bb..1a609649bb 100644
--- a/doc/book/src/old/AMQP.xml
+++ b/qpid/doc/book/src/old/AMQP.xml
diff --git a/doc/book/src/old/Binding-URL-Format.xml b/qpid/doc/book/src/old/Binding-URL-Format.xml
index 3d938b740a..3d938b740a 100644
--- a/doc/book/src/old/Binding-URL-Format.xml
+++ b/qpid/doc/book/src/old/Binding-URL-Format.xml
diff --git a/doc/book/src/old/Book-Info.xml b/qpid/doc/book/src/old/Book-Info.xml
index 2e02fbe8ea..2e02fbe8ea 100644
--- a/doc/book/src/old/Book-Info.xml
+++ b/qpid/doc/book/src/old/Book-Info.xml
diff --git a/doc/book/src/old/Book.xml b/qpid/doc/book/src/old/Book.xml
index ee69532152..ee69532152 100644
--- a/doc/book/src/old/Book.xml
+++ b/qpid/doc/book/src/old/Book.xml
diff --git a/doc/book/src/old/Broker-CPP.xml b/qpid/doc/book/src/old/Broker-CPP.xml
index 99584be23d..99584be23d 100644
--- a/doc/book/src/old/Broker-CPP.xml
+++ b/qpid/doc/book/src/old/Broker-CPP.xml
diff --git a/doc/book/src/old/Broker-Java.xml b/qpid/doc/book/src/old/Broker-Java.xml
index f8ce89b185..f8ce89b185 100644
--- a/doc/book/src/old/Broker-Java.xml
+++ b/qpid/doc/book/src/old/Broker-Java.xml
diff --git a/doc/book/src/old/Clients.xml b/qpid/doc/book/src/old/Clients.xml
index 3dc2d38e86..3dc2d38e86 100644
--- a/doc/book/src/old/Clients.xml
+++ b/qpid/doc/book/src/old/Clients.xml
diff --git a/doc/book/src/old/Connection-URL-Format.xml b/qpid/doc/book/src/old/Connection-URL-Format.xml
index cb772487cd..cb772487cd 100644
--- a/doc/book/src/old/Connection-URL-Format.xml
+++ b/qpid/doc/book/src/old/Connection-URL-Format.xml
diff --git a/doc/book/src/old/Download.xml b/qpid/doc/book/src/old/Download.xml
index 7bc08143ac..7bc08143ac 100644
--- a/doc/book/src/old/Download.xml
+++ b/qpid/doc/book/src/old/Download.xml
diff --git a/doc/book/src/old/Excel-AddIn.xml b/qpid/doc/book/src/old/Excel-AddIn.xml
index e38f620bd8..e38f620bd8 100644
--- a/doc/book/src/old/Excel-AddIn.xml
+++ b/qpid/doc/book/src/old/Excel-AddIn.xml
diff --git a/doc/book/src/old/FAQ.xml b/qpid/doc/book/src/old/FAQ.xml
index 5647f18f69..5647f18f69 100644
--- a/doc/book/src/old/FAQ.xml
+++ b/qpid/doc/book/src/old/FAQ.xml
diff --git a/doc/book/src/old/Getting-Started.xml b/qpid/doc/book/src/old/Getting-Started.xml
index 216a52170e..216a52170e 100644
--- a/doc/book/src/old/Getting-Started.xml
+++ b/qpid/doc/book/src/old/Getting-Started.xml
diff --git a/doc/book/src/old/How-to-Use-JNDI.xml b/qpid/doc/book/src/old/How-to-Use-JNDI.xml
index 0d6315c2a3..0d6315c2a3 100644
--- a/doc/book/src/old/How-to-Use-JNDI.xml
+++ b/qpid/doc/book/src/old/How-to-Use-JNDI.xml
diff --git a/doc/book/src/old/InfoPlugin.xml b/qpid/doc/book/src/old/InfoPlugin.xml
index aebcd08c02..aebcd08c02 100644
--- a/doc/book/src/old/InfoPlugin.xml
+++ b/qpid/doc/book/src/old/InfoPlugin.xml
diff --git a/doc/book/src/old/Introduction.xml b/qpid/doc/book/src/old/Introduction.xml
index 8f92c207cf..8f92c207cf 100644
--- a/doc/book/src/old/Introduction.xml
+++ b/qpid/doc/book/src/old/Introduction.xml
diff --git a/doc/book/src/old/Java-Broker-StatusLogMessages.xml b/qpid/doc/book/src/old/Java-Broker-StatusLogMessages.xml
index 98f876e532..98f876e532 100644
--- a/doc/book/src/old/Java-Broker-StatusLogMessages.xml
+++ b/qpid/doc/book/src/old/Java-Broker-StatusLogMessages.xml
diff --git a/doc/book/src/old/Java-JMS-Selector-Syntax.xml b/qpid/doc/book/src/old/Java-JMS-Selector-Syntax.xml
index 870e277b66..870e277b66 100644
--- a/doc/book/src/old/Java-JMS-Selector-Syntax.xml
+++ b/qpid/doc/book/src/old/Java-JMS-Selector-Syntax.xml
diff --git a/doc/book/src/old/Management-Design-notes.xml b/qpid/doc/book/src/old/Management-Design-notes.xml
index 76f0dac926..76f0dac926 100644
--- a/doc/book/src/old/Management-Design-notes.xml
+++ b/qpid/doc/book/src/old/Management-Design-notes.xml
diff --git a/doc/book/src/old/NET-User-Guide.xml b/qpid/doc/book/src/old/NET-User-Guide.xml
index 7bfa20b8c8..7bfa20b8c8 100644
--- a/doc/book/src/old/NET-User-Guide.xml
+++ b/qpid/doc/book/src/old/NET-User-Guide.xml
diff --git a/doc/book/src/old/PythonBrokerTest.xml b/qpid/doc/book/src/old/PythonBrokerTest.xml
index ae7edade40..ae7edade40 100644
--- a/doc/book/src/old/PythonBrokerTest.xml
+++ b/qpid/doc/book/src/old/PythonBrokerTest.xml
diff --git a/doc/book/src/old/QMan-Qpid-Management-bridge.xml b/qpid/doc/book/src/old/QMan-Qpid-Management-bridge.xml
index f2c366dcbb..f2c366dcbb 100644
--- a/doc/book/src/old/QMan-Qpid-Management-bridge.xml
+++ b/qpid/doc/book/src/old/QMan-Qpid-Management-bridge.xml
diff --git a/doc/book/src/old/Qpid-ACLs.xml b/qpid/doc/book/src/old/Qpid-ACLs.xml
index a2b64061c3..a2b64061c3 100644
--- a/doc/book/src/old/Qpid-ACLs.xml
+++ b/qpid/doc/book/src/old/Qpid-ACLs.xml
diff --git a/doc/book/src/old/Qpid-Book.xml b/qpid/doc/book/src/old/Qpid-Book.xml
index ee69532152..ee69532152 100644
--- a/doc/book/src/old/Qpid-Book.xml
+++ b/qpid/doc/book/src/old/Qpid-Book.xml
diff --git a/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml b/qpid/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml
index f382f390c7..f382f390c7 100644
--- a/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml
+++ b/qpid/doc/book/src/old/Qpid-Compatibility-And-Interoperability-Book.xml
diff --git a/doc/book/src/old/SASL-Compatibility.xml b/qpid/doc/book/src/old/SASL-Compatibility.xml
index ad223792b5..ad223792b5 100644
--- a/doc/book/src/old/SASL-Compatibility.xml
+++ b/qpid/doc/book/src/old/SASL-Compatibility.xml
diff --git a/doc/book/src/old/SSL.xml b/qpid/doc/book/src/old/SSL.xml
index a9a5cb953a..a9a5cb953a 100644
--- a/doc/book/src/old/SSL.xml
+++ b/qpid/doc/book/src/old/SSL.xml
diff --git a/doc/book/src/old/Security-Plugins.xml b/qpid/doc/book/src/old/Security-Plugins.xml
index bf5cb726b3..bf5cb726b3 100644
--- a/doc/book/src/old/Security-Plugins.xml
+++ b/qpid/doc/book/src/old/Security-Plugins.xml
diff --git a/doc/book/src/old/System-Properties.xml b/qpid/doc/book/src/old/System-Properties.xml
index 40b823185f..40b823185f 100644
--- a/doc/book/src/old/System-Properties.xml
+++ b/qpid/doc/book/src/old/System-Properties.xml
diff --git a/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml b/qpid/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml
index 2bd7d761ef..2bd7d761ef 100644
--- a/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml
+++ b/qpid/doc/book/src/old/Using-Qpid-with-other-JNDI-Providers.xml
diff --git a/doc/book/src/old/WCF.xml b/qpid/doc/book/src/old/WCF.xml
index aaf54463db..aaf54463db 100644
--- a/doc/book/src/old/WCF.xml
+++ b/qpid/doc/book/src/old/WCF.xml
diff --git a/doc/book/src/old/schemas.xml b/qpid/doc/book/src/old/schemas.xml
index 6102e65f07..6102e65f07 100644
--- a/doc/book/src/old/schemas.xml
+++ b/qpid/doc/book/src/old/schemas.xml
diff --git a/doc/book/src/programming/Makefile b/qpid/doc/book/src/programming/Makefile
index 0266a0f54d..0266a0f54d 100644
--- a/doc/book/src/programming/Makefile
+++ b/qpid/doc/book/src/programming/Makefile
diff --git a/doc/book/src/programming/Message-Groups-Guide.xml b/qpid/doc/book/src/programming/Message-Groups-Guide.xml
index 0ec6982bac..0ec6982bac 100644
--- a/doc/book/src/programming/Message-Groups-Guide.xml
+++ b/qpid/doc/book/src/programming/Message-Groups-Guide.xml
diff --git a/doc/book/src/programming/Programming-In-Apache-Qpid.xml b/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml
index 8bd9225fb2..8bd9225fb2 100644
--- a/doc/book/src/programming/Programming-In-Apache-Qpid.xml
+++ b/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml
diff --git a/doc/book/src/qmf/QmfBook.xml b/qpid/doc/book/src/qmf/QmfBook.xml
index 64a6545fb5..64a6545fb5 100644
--- a/doc/book/src/qmf/QmfBook.xml
+++ b/qpid/doc/book/src/qmf/QmfBook.xml
diff --git a/doc/book/src/qmf/QmfIntroduction.xml b/qpid/doc/book/src/qmf/QmfIntroduction.xml
index db7b8949a5..db7b8949a5 100644
--- a/doc/book/src/qmf/QmfIntroduction.xml
+++ b/qpid/doc/book/src/qmf/QmfIntroduction.xml
diff --git a/doc/book/xsl/html-custom.xsl b/qpid/doc/book/xsl/html-custom.xsl
index dbfbcc44c7..dbfbcc44c7 100644
--- a/doc/book/xsl/html-custom.xsl
+++ b/qpid/doc/book/xsl/html-custom.xsl
diff --git a/doc/dev-readme/QPID-Component-README.odg b/qpid/doc/dev-readme/QPID-Component-README.odg
index 217a6d68d8..217a6d68d8 100644
--- a/doc/dev-readme/QPID-Component-README.odg
+++ b/qpid/doc/dev-readme/QPID-Component-README.odg
diff --git a/doc/dev-readme/QPID-Component-README.pdf b/qpid/doc/dev-readme/QPID-Component-README.pdf
index 3012372889..3012372889 100644
--- a/doc/dev-readme/QPID-Component-README.pdf
+++ b/qpid/doc/dev-readme/QPID-Component-README.pdf
diff --git a/doc/dev-readme/README.txt b/qpid/doc/dev-readme/README.txt
index 65a8626e53..65a8626e53 100644
--- a/doc/dev-readme/README.txt
+++ b/qpid/doc/dev-readme/README.txt
diff --git a/doc/website/README.txt b/qpid/doc/website/README.txt
index dcb3b423e5..dcb3b423e5 100644
--- a/doc/website/README.txt
+++ b/qpid/doc/website/README.txt
diff --git a/etc/LICENSE b/qpid/etc/LICENSE
index bc46b77047..bc46b77047 100644
--- a/etc/LICENSE
+++ b/qpid/etc/LICENSE
diff --git a/etc/NOTICE b/qpid/etc/NOTICE
index 05f39ba176..05f39ba176 100644
--- a/etc/NOTICE
+++ b/qpid/etc/NOTICE
diff --git a/etc/svn-auto-props b/qpid/etc/svn-auto-props
index 35f1d10998..35f1d10998 100644
--- a/etc/svn-auto-props
+++ b/qpid/etc/svn-auto-props
diff --git a/extras/dispatch/README b/qpid/extras/dispatch/README
index 24cba9ed6e..24cba9ed6e 100644
--- a/extras/dispatch/README
+++ b/qpid/extras/dispatch/README
diff --git a/extras/qmf/.gitignore b/qpid/extras/qmf/.gitignore
index 846f2ac5b0..846f2ac5b0 100644
--- a/extras/qmf/.gitignore
+++ b/qpid/extras/qmf/.gitignore
diff --git a/extras/qmf/LICENSE.txt b/qpid/extras/qmf/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100644
--- a/extras/qmf/LICENSE.txt
+++ b/qpid/extras/qmf/LICENSE.txt
diff --git a/extras/qmf/MANIFEST.in b/qpid/extras/qmf/MANIFEST.in
index ab30e9acee..ab30e9acee 100644
--- a/extras/qmf/MANIFEST.in
+++ b/qpid/extras/qmf/MANIFEST.in
diff --git a/extras/qmf/NOTICE.txt b/qpid/extras/qmf/NOTICE.txt
index f4795d5ced..f4795d5ced 100644
--- a/extras/qmf/NOTICE.txt
+++ b/qpid/extras/qmf/NOTICE.txt
diff --git a/extras/qmf/setup.py b/qpid/extras/qmf/setup.py
index 2190b6e11e..2190b6e11e 100755
--- a/extras/qmf/setup.py
+++ b/qpid/extras/qmf/setup.py
diff --git a/extras/qmf/src/py/qmf/__init__.py b/qpid/extras/qmf/src/py/qmf/__init__.py
index 31d5a2ef58..31d5a2ef58 100644
--- a/extras/qmf/src/py/qmf/__init__.py
+++ b/qpid/extras/qmf/src/py/qmf/__init__.py
diff --git a/extras/qmf/src/py/qmf/console.py b/qpid/extras/qmf/src/py/qmf/console.py
index 67abf351d0..67abf351d0 100644
--- a/extras/qmf/src/py/qmf/console.py
+++ b/qpid/extras/qmf/src/py/qmf/console.py
diff --git a/extras/sasl/LICENSE b/qpid/extras/sasl/LICENSE
index cff2a5e25d..cff2a5e25d 100644
--- a/extras/sasl/LICENSE
+++ b/qpid/extras/sasl/LICENSE
diff --git a/extras/sasl/Makefile.am b/qpid/extras/sasl/Makefile.am
index efa6d4f2d3..efa6d4f2d3 100644
--- a/extras/sasl/Makefile.am
+++ b/qpid/extras/sasl/Makefile.am
diff --git a/extras/sasl/bootstrap b/qpid/extras/sasl/bootstrap
index 906e5a71e4..906e5a71e4 100755
--- a/extras/sasl/bootstrap
+++ b/qpid/extras/sasl/bootstrap
diff --git a/extras/sasl/build-aux/compile b/qpid/extras/sasl/build-aux/compile
index 1b1d232169..1b1d232169 100755
--- a/extras/sasl/build-aux/compile
+++ b/qpid/extras/sasl/build-aux/compile
diff --git a/extras/sasl/build-aux/config.guess b/qpid/extras/sasl/build-aux/config.guess
index c93201a4d2..c93201a4d2 100755
--- a/extras/sasl/build-aux/config.guess
+++ b/qpid/extras/sasl/build-aux/config.guess
diff --git a/extras/sasl/build-aux/config.rpath b/qpid/extras/sasl/build-aux/config.rpath
index c492a93b66..c492a93b66 100755
--- a/extras/sasl/build-aux/config.rpath
+++ b/qpid/extras/sasl/build-aux/config.rpath
diff --git a/extras/sasl/build-aux/config.sub b/qpid/extras/sasl/build-aux/config.sub
index 7ccee73057..7ccee73057 100755
--- a/extras/sasl/build-aux/config.sub
+++ b/qpid/extras/sasl/build-aux/config.sub
diff --git a/extras/sasl/build-aux/depcomp b/qpid/extras/sasl/build-aux/depcomp
index ca5ea4e1ef..ca5ea4e1ef 100755
--- a/extras/sasl/build-aux/depcomp
+++ b/qpid/extras/sasl/build-aux/depcomp
diff --git a/extras/sasl/build-aux/install-sh b/qpid/extras/sasl/build-aux/install-sh
index 4fbbae7b7f..4fbbae7b7f 100755
--- a/extras/sasl/build-aux/install-sh
+++ b/qpid/extras/sasl/build-aux/install-sh
diff --git a/extras/sasl/build-aux/mdate-sh b/qpid/extras/sasl/build-aux/mdate-sh
index cd916c0a34..cd916c0a34 100755
--- a/extras/sasl/build-aux/mdate-sh
+++ b/qpid/extras/sasl/build-aux/mdate-sh
diff --git a/extras/sasl/build-aux/missing b/qpid/extras/sasl/build-aux/missing
index 1c8ff7049d..1c8ff7049d 100755
--- a/extras/sasl/build-aux/missing
+++ b/qpid/extras/sasl/build-aux/missing
diff --git a/extras/sasl/build-aux/py-compile b/qpid/extras/sasl/build-aux/py-compile
index 1fad0975ce..1fad0975ce 120000
--- a/extras/sasl/build-aux/py-compile
+++ b/qpid/extras/sasl/build-aux/py-compile
diff --git a/extras/sasl/configure.ac b/qpid/extras/sasl/configure.ac
index bc0fadbb31..bc0fadbb31 100644
--- a/extras/sasl/configure.ac
+++ b/qpid/extras/sasl/configure.ac
diff --git a/extras/sasl/include/saslwrapper.h b/qpid/extras/sasl/include/saslwrapper.h
index bb2a9af7ff..bb2a9af7ff 100644
--- a/extras/sasl/include/saslwrapper.h
+++ b/qpid/extras/sasl/include/saslwrapper.h
diff --git a/extras/sasl/m4/ac_pkg_swig.m4 b/qpid/extras/sasl/m4/ac_pkg_swig.m4
index 6e385c067c..6e385c067c 100644
--- a/extras/sasl/m4/ac_pkg_swig.m4
+++ b/qpid/extras/sasl/m4/ac_pkg_swig.m4
diff --git a/extras/sasl/m4/compiler-flags.m4 b/qpid/extras/sasl/m4/compiler-flags.m4
index 01cb728f02..01cb728f02 100644
--- a/extras/sasl/m4/compiler-flags.m4
+++ b/qpid/extras/sasl/m4/compiler-flags.m4
diff --git a/extras/sasl/python/Makefile.am b/qpid/extras/sasl/python/Makefile.am
index 7c61f37cee..7c61f37cee 100644
--- a/extras/sasl/python/Makefile.am
+++ b/qpid/extras/sasl/python/Makefile.am
diff --git a/extras/sasl/python/python.i b/qpid/extras/sasl/python/python.i
index 9f4e7ee8af..9f4e7ee8af 100644
--- a/extras/sasl/python/python.i
+++ b/qpid/extras/sasl/python/python.i
diff --git a/extras/sasl/ruby/Makefile.am b/qpid/extras/sasl/ruby/Makefile.am
index 85fde1085d..85fde1085d 100644
--- a/extras/sasl/ruby/Makefile.am
+++ b/qpid/extras/sasl/ruby/Makefile.am
diff --git a/extras/sasl/ruby/ruby.i b/qpid/extras/sasl/ruby/ruby.i
index 7c20f7f071..7c20f7f071 100644
--- a/extras/sasl/ruby/ruby.i
+++ b/qpid/extras/sasl/ruby/ruby.i
diff --git a/extras/sasl/src/Makefile.am b/qpid/extras/sasl/src/Makefile.am
index c2aa8dd188..c2aa8dd188 100644
--- a/extras/sasl/src/Makefile.am
+++ b/qpid/extras/sasl/src/Makefile.am
diff --git a/extras/sasl/src/cyrus/saslwrapper.cpp b/qpid/extras/sasl/src/cyrus/saslwrapper.cpp
index f8b08acfa6..f8b08acfa6 100644
--- a/extras/sasl/src/cyrus/saslwrapper.cpp
+++ b/qpid/extras/sasl/src/cyrus/saslwrapper.cpp
diff --git a/extras/sasl/src/saslwrapper.i b/qpid/extras/sasl/src/saslwrapper.i
index 533ac79ce5..533ac79ce5 100644
--- a/extras/sasl/src/saslwrapper.i
+++ b/qpid/extras/sasl/src/saslwrapper.i
diff --git a/packaging/windows/INSTALL_NOTES.html b/qpid/packaging/windows/INSTALL_NOTES.html
index be3acbd4b5..be3acbd4b5 100644
--- a/packaging/windows/INSTALL_NOTES.html
+++ b/qpid/packaging/windows/INSTALL_NOTES.html
diff --git a/packaging/windows/LICENSE.rtf b/qpid/packaging/windows/LICENSE.rtf
index 04fddfe8b6..04fddfe8b6 100644
--- a/packaging/windows/LICENSE.rtf
+++ b/qpid/packaging/windows/LICENSE.rtf
diff --git a/packaging/windows/build_installer.bat b/qpid/packaging/windows/build_installer.bat
index addc33f32b..addc33f32b 100644
--- a/packaging/windows/build_installer.bat
+++ b/qpid/packaging/windows/build_installer.bat
diff --git a/packaging/windows/installer.proj b/qpid/packaging/windows/installer.proj
index 27ee05e2f5..27ee05e2f5 100644
--- a/packaging/windows/installer.proj
+++ b/qpid/packaging/windows/installer.proj
diff --git a/packaging/windows/qpid-icon.ico b/qpid/packaging/windows/qpid-icon.ico
index 112f5d8f1f..112f5d8f1f 100644
--- a/packaging/windows/qpid-icon.ico
+++ b/qpid/packaging/windows/qpid-icon.ico
diff --git a/packaging/windows/qpid-install-background.bmp b/qpid/packaging/windows/qpid-install-background.bmp
index 7a287f107f..7a287f107f 100644
--- a/packaging/windows/qpid-install-background.bmp
+++ b/qpid/packaging/windows/qpid-install-background.bmp
diff --git a/packaging/windows/qpid-install-banner.bmp b/qpid/packaging/windows/qpid-install-banner.bmp
index 73184a9235..73184a9235 100644
--- a/packaging/windows/qpid-install-banner.bmp
+++ b/qpid/packaging/windows/qpid-install-banner.bmp
diff --git a/packaging/windows/qpidc.wxs b/qpid/packaging/windows/qpidc.wxs
index d249423c99..d249423c99 100644
--- a/packaging/windows/qpidc.wxs
+++ b/qpid/packaging/windows/qpidc.wxs
diff --git a/python/LICENSE.txt b/qpid/python/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100644
--- a/python/LICENSE.txt
+++ b/qpid/python/LICENSE.txt
diff --git a/python/MANIFEST.in b/qpid/python/MANIFEST.in
index ca53073c04..ca53073c04 100644
--- a/python/MANIFEST.in
+++ b/qpid/python/MANIFEST.in
diff --git a/python/NOTICE.txt b/qpid/python/NOTICE.txt
index 4175a06c99..4175a06c99 100644
--- a/python/NOTICE.txt
+++ b/qpid/python/NOTICE.txt
diff --git a/python/README.txt b/qpid/python/README.txt
index e076e2d216..e076e2d216 100644
--- a/python/README.txt
+++ b/qpid/python/README.txt
diff --git a/python/doc/test-requirements.txt b/qpid/python/doc/test-requirements.txt
index 5089b49dbe..5089b49dbe 100644
--- a/python/doc/test-requirements.txt
+++ b/qpid/python/doc/test-requirements.txt
diff --git a/python/examples/README.txt b/qpid/python/examples/README.txt
index 4395160fec..4395160fec 100644
--- a/python/examples/README.txt
+++ b/qpid/python/examples/README.txt
diff --git a/python/examples/api/drain b/qpid/python/examples/api/drain
index 5e30153bc2..5e30153bc2 100755
--- a/python/examples/api/drain
+++ b/qpid/python/examples/api/drain
diff --git a/python/examples/api/hello b/qpid/python/examples/api/hello
index ad314da19e..ad314da19e 100755
--- a/python/examples/api/hello
+++ b/qpid/python/examples/api/hello
diff --git a/python/examples/api/hello_xml b/qpid/python/examples/api/hello_xml
index ab567ec5dd..ab567ec5dd 100755
--- a/python/examples/api/hello_xml
+++ b/qpid/python/examples/api/hello_xml
diff --git a/python/examples/api/server b/qpid/python/examples/api/server
index 78d812bfd2..78d812bfd2 100755
--- a/python/examples/api/server
+++ b/qpid/python/examples/api/server
diff --git a/python/examples/api/spout b/qpid/python/examples/api/spout
index 6584b853fc..6584b853fc 100755
--- a/python/examples/api/spout
+++ b/qpid/python/examples/api/spout
diff --git a/python/examples/api/statistics.py b/qpid/python/examples/api/statistics.py
index e095920e90..e095920e90 100644
--- a/python/examples/api/statistics.py
+++ b/qpid/python/examples/api/statistics.py
diff --git a/python/examples/reservations/common.py b/qpid/python/examples/reservations/common.py
index 12f07e1c92..12f07e1c92 100644
--- a/python/examples/reservations/common.py
+++ b/qpid/python/examples/reservations/common.py
diff --git a/python/examples/reservations/inventory b/qpid/python/examples/reservations/inventory
index 0a49643e5f..0a49643e5f 100755
--- a/python/examples/reservations/inventory
+++ b/qpid/python/examples/reservations/inventory
diff --git a/python/examples/reservations/machine-agent b/qpid/python/examples/reservations/machine-agent
index a221a8b6de..a221a8b6de 100755
--- a/python/examples/reservations/machine-agent
+++ b/qpid/python/examples/reservations/machine-agent
diff --git a/python/examples/reservations/reserve b/qpid/python/examples/reservations/reserve
index 68e7fee912..68e7fee912 100755
--- a/python/examples/reservations/reserve
+++ b/qpid/python/examples/reservations/reserve
diff --git a/python/mllib/__init__.py b/qpid/python/mllib/__init__.py
index af192df1d1..af192df1d1 100644
--- a/python/mllib/__init__.py
+++ b/qpid/python/mllib/__init__.py
diff --git a/python/mllib/dom.py b/qpid/python/mllib/dom.py
index 486f7082e1..486f7082e1 100644
--- a/python/mllib/dom.py
+++ b/qpid/python/mllib/dom.py
diff --git a/python/mllib/parsers.py b/qpid/python/mllib/parsers.py
index 3e7cc10dc2..3e7cc10dc2 100644
--- a/python/mllib/parsers.py
+++ b/qpid/python/mllib/parsers.py
diff --git a/python/mllib/transforms.py b/qpid/python/mllib/transforms.py
index 69d99125e3..69d99125e3 100644
--- a/python/mllib/transforms.py
+++ b/qpid/python/mllib/transforms.py
diff --git a/python/qpid-python-test b/qpid/python/qpid-python-test
index dfe6a6fc7a..dfe6a6fc7a 100755
--- a/python/qpid-python-test
+++ b/qpid/python/qpid-python-test
diff --git a/python/qpid-python-test-ant.xml b/qpid/python/qpid-python-test-ant.xml
index f70e8923ed..f70e8923ed 100644
--- a/python/qpid-python-test-ant.xml
+++ b/qpid/python/qpid-python-test-ant.xml
diff --git a/python/qpid/__init__.py b/qpid/python/qpid/__init__.py
index 780cab46a0..780cab46a0 100644
--- a/python/qpid/__init__.py
+++ b/qpid/python/qpid/__init__.py
diff --git a/python/qpid/client.py b/qpid/python/qpid/client.py
index 5fedaa2cb1..5fedaa2cb1 100644
--- a/python/qpid/client.py
+++ b/qpid/python/qpid/client.py
diff --git a/python/qpid/codec.py b/qpid/python/qpid/codec.py
index a4c542415c..a4c542415c 100644
--- a/python/qpid/codec.py
+++ b/qpid/python/qpid/codec.py
diff --git a/python/qpid/codec010.py b/qpid/python/qpid/codec010.py
index f4dc60fcc4..f4dc60fcc4 100644
--- a/python/qpid/codec010.py
+++ b/qpid/python/qpid/codec010.py
diff --git a/python/qpid/compat.py b/qpid/python/qpid/compat.py
index 12966c2383..12966c2383 100644
--- a/python/qpid/compat.py
+++ b/qpid/python/qpid/compat.py
diff --git a/python/qpid/concurrency.py b/qpid/python/qpid/concurrency.py
index eefe0d445f..eefe0d445f 100644
--- a/python/qpid/concurrency.py
+++ b/qpid/python/qpid/concurrency.py
diff --git a/python/qpid/connection.py b/qpid/python/qpid/connection.py
index 2453f38c34..2453f38c34 100644
--- a/python/qpid/connection.py
+++ b/qpid/python/qpid/connection.py
diff --git a/python/qpid/connection08.py b/qpid/python/qpid/connection08.py
index 9565937a6e..9565937a6e 100644
--- a/python/qpid/connection08.py
+++ b/qpid/python/qpid/connection08.py
diff --git a/python/qpid/content.py b/qpid/python/qpid/content.py
index 9391f4f1a8..9391f4f1a8 100644
--- a/python/qpid/content.py
+++ b/qpid/python/qpid/content.py
diff --git a/python/qpid/datatypes.py b/qpid/python/qpid/datatypes.py
index ca1466c261..ca1466c261 100644
--- a/python/qpid/datatypes.py
+++ b/qpid/python/qpid/datatypes.py
diff --git a/python/qpid/debug.py b/qpid/python/qpid/debug.py
index b5dbd4d9d9..b5dbd4d9d9 100644
--- a/python/qpid/debug.py
+++ b/qpid/python/qpid/debug.py
diff --git a/python/qpid/delegate.py b/qpid/python/qpid/delegate.py
index b447c4aa29..b447c4aa29 100644
--- a/python/qpid/delegate.py
+++ b/qpid/python/qpid/delegate.py
diff --git a/python/qpid/delegates.py b/qpid/python/qpid/delegates.py
index ae7ed7f988..ae7ed7f988 100644
--- a/python/qpid/delegates.py
+++ b/qpid/python/qpid/delegates.py
diff --git a/python/qpid/disp.py b/qpid/python/qpid/disp.py
index d1340b8a05..d1340b8a05 100644
--- a/python/qpid/disp.py
+++ b/qpid/python/qpid/disp.py
diff --git a/python/qpid/exceptions.py b/qpid/python/qpid/exceptions.py
index 2bd80b7ffe..2bd80b7ffe 100644
--- a/python/qpid/exceptions.py
+++ b/qpid/python/qpid/exceptions.py
diff --git a/python/qpid/framer.py b/qpid/python/qpid/framer.py
index 08e172287f..08e172287f 100644
--- a/python/qpid/framer.py
+++ b/qpid/python/qpid/framer.py
diff --git a/python/qpid/framing.py b/qpid/python/qpid/framing.py
index 389b607853..389b607853 100644
--- a/python/qpid/framing.py
+++ b/qpid/python/qpid/framing.py
diff --git a/python/qpid/generator.py b/qpid/python/qpid/generator.py
index 02d11e5005..02d11e5005 100644
--- a/python/qpid/generator.py
+++ b/qpid/python/qpid/generator.py
diff --git a/python/qpid/harness.py b/qpid/python/qpid/harness.py
index ce48481612..ce48481612 100644
--- a/python/qpid/harness.py
+++ b/qpid/python/qpid/harness.py
diff --git a/python/qpid/lexer.py b/qpid/python/qpid/lexer.py
index ec28bbb91a..ec28bbb91a 100644
--- a/python/qpid/lexer.py
+++ b/qpid/python/qpid/lexer.py
diff --git a/python/qpid/log.py b/qpid/python/qpid/log.py
index 1fd7d74136..1fd7d74136 100644
--- a/python/qpid/log.py
+++ b/qpid/python/qpid/log.py
diff --git a/python/qpid/management.py b/qpid/python/qpid/management.py
index 3de8da9d49..3de8da9d49 100644
--- a/python/qpid/management.py
+++ b/qpid/python/qpid/management.py
diff --git a/python/qpid/managementdata.py b/qpid/python/qpid/managementdata.py
index 61cb10c134..61cb10c134 100644
--- a/python/qpid/managementdata.py
+++ b/qpid/python/qpid/managementdata.py
diff --git a/python/qpid/message.py b/qpid/python/qpid/message.py
index 4d31da2846..4d31da2846 100644
--- a/python/qpid/message.py
+++ b/qpid/python/qpid/message.py
diff --git a/python/qpid/messaging/__init__.py b/qpid/python/qpid/messaging/__init__.py
index f9ddda2e80..f9ddda2e80 100644
--- a/python/qpid/messaging/__init__.py
+++ b/qpid/python/qpid/messaging/__init__.py
diff --git a/python/qpid/messaging/address.py b/qpid/python/qpid/messaging/address.py
index e423f09193..e423f09193 100644
--- a/python/qpid/messaging/address.py
+++ b/qpid/python/qpid/messaging/address.py
diff --git a/python/qpid/messaging/constants.py b/qpid/python/qpid/messaging/constants.py
index f230c4def8..f230c4def8 100644
--- a/python/qpid/messaging/constants.py
+++ b/qpid/python/qpid/messaging/constants.py
diff --git a/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py
index 74ed038b0e..74ed038b0e 100644
--- a/python/qpid/messaging/driver.py
+++ b/qpid/python/qpid/messaging/driver.py
diff --git a/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py
index 2797677b1d..2797677b1d 100644
--- a/python/qpid/messaging/endpoints.py
+++ b/qpid/python/qpid/messaging/endpoints.py
diff --git a/python/qpid/messaging/exceptions.py b/qpid/python/qpid/messaging/exceptions.py
index 2284d7cde9..2284d7cde9 100644
--- a/python/qpid/messaging/exceptions.py
+++ b/qpid/python/qpid/messaging/exceptions.py
diff --git a/python/qpid/messaging/message.py b/qpid/python/qpid/messaging/message.py
index b70b365c16..b70b365c16 100644
--- a/python/qpid/messaging/message.py
+++ b/qpid/python/qpid/messaging/message.py
diff --git a/python/qpid/messaging/transports.py b/qpid/python/qpid/messaging/transports.py
index f39c256d02..f39c256d02 100644
--- a/python/qpid/messaging/transports.py
+++ b/qpid/python/qpid/messaging/transports.py
diff --git a/python/qpid/messaging/util.py b/qpid/python/qpid/messaging/util.py
index 726cfd5172..726cfd5172 100644
--- a/python/qpid/messaging/util.py
+++ b/qpid/python/qpid/messaging/util.py
diff --git a/python/qpid/mimetype.py b/qpid/python/qpid/mimetype.py
index f512996b9f..f512996b9f 100644
--- a/python/qpid/mimetype.py
+++ b/qpid/python/qpid/mimetype.py
diff --git a/python/qpid/ops.py b/qpid/python/qpid/ops.py
index 390552be6d..390552be6d 100644
--- a/python/qpid/ops.py
+++ b/qpid/python/qpid/ops.py
diff --git a/python/qpid/packer.py b/qpid/python/qpid/packer.py
index 22c16918dc..22c16918dc 100644
--- a/python/qpid/packer.py
+++ b/qpid/python/qpid/packer.py
diff --git a/python/qpid/parser.py b/qpid/python/qpid/parser.py
index 233f0a8469..233f0a8469 100644
--- a/python/qpid/parser.py
+++ b/qpid/python/qpid/parser.py
diff --git a/python/qpid/peer.py b/qpid/python/qpid/peer.py
index fcad0f3ae6..fcad0f3ae6 100644
--- a/python/qpid/peer.py
+++ b/qpid/python/qpid/peer.py
diff --git a/python/qpid/queue.py b/qpid/python/qpid/queue.py
index 63a7684843..63a7684843 100644
--- a/python/qpid/queue.py
+++ b/qpid/python/qpid/queue.py
diff --git a/python/qpid/reference.py b/qpid/python/qpid/reference.py
index 48ecb67656..48ecb67656 100644
--- a/python/qpid/reference.py
+++ b/qpid/python/qpid/reference.py
diff --git a/python/qpid/sasl.py b/qpid/python/qpid/sasl.py
index a2147e3cc4..a2147e3cc4 100644
--- a/python/qpid/sasl.py
+++ b/qpid/python/qpid/sasl.py
diff --git a/python/qpid/saslmech/__init__.py b/qpid/python/qpid/saslmech/__init__.py
index ebcab03ca2..ebcab03ca2 100644
--- a/python/qpid/saslmech/__init__.py
+++ b/qpid/python/qpid/saslmech/__init__.py
diff --git a/python/qpid/saslmech/amqplain.py b/qpid/python/qpid/saslmech/amqplain.py
index 731f6b6628..731f6b6628 100644
--- a/python/qpid/saslmech/amqplain.py
+++ b/qpid/python/qpid/saslmech/amqplain.py
diff --git a/python/qpid/saslmech/anonymous.py b/qpid/python/qpid/saslmech/anonymous.py
index 1002a3aa0a..1002a3aa0a 100644
--- a/python/qpid/saslmech/anonymous.py
+++ b/qpid/python/qpid/saslmech/anonymous.py
diff --git a/python/qpid/saslmech/cram_md5.py b/qpid/python/qpid/saslmech/cram_md5.py
index a351f43838..a351f43838 100644
--- a/python/qpid/saslmech/cram_md5.py
+++ b/qpid/python/qpid/saslmech/cram_md5.py
diff --git a/python/qpid/saslmech/cram_md5_hex.py b/qpid/python/qpid/saslmech/cram_md5_hex.py
index 03463db083..03463db083 100644
--- a/python/qpid/saslmech/cram_md5_hex.py
+++ b/qpid/python/qpid/saslmech/cram_md5_hex.py
diff --git a/python/qpid/saslmech/external.py b/qpid/python/qpid/saslmech/external.py
index 51c8d97530..51c8d97530 100644
--- a/python/qpid/saslmech/external.py
+++ b/qpid/python/qpid/saslmech/external.py
diff --git a/python/qpid/saslmech/finder.py b/qpid/python/qpid/saslmech/finder.py
index 1dda9ec48f..1dda9ec48f 100644
--- a/python/qpid/saslmech/finder.py
+++ b/qpid/python/qpid/saslmech/finder.py
diff --git a/python/qpid/saslmech/plain.py b/qpid/python/qpid/saslmech/plain.py
index 8e6fb74f33..8e6fb74f33 100644
--- a/python/qpid/saslmech/plain.py
+++ b/qpid/python/qpid/saslmech/plain.py
diff --git a/python/qpid/saslmech/sasl.py b/qpid/python/qpid/saslmech/sasl.py
index 7b1ae058db..7b1ae058db 100644
--- a/python/qpid/saslmech/sasl.py
+++ b/qpid/python/qpid/saslmech/sasl.py
diff --git a/python/qpid/saslmech/scram.py b/qpid/python/qpid/saslmech/scram.py
index 11a2d2fbe4..11a2d2fbe4 100644
--- a/python/qpid/saslmech/scram.py
+++ b/qpid/python/qpid/saslmech/scram.py
diff --git a/python/qpid/saslmech/scram_sha_1.py b/qpid/python/qpid/saslmech/scram_sha_1.py
index 83f58f8e76..83f58f8e76 100644
--- a/python/qpid/saslmech/scram_sha_1.py
+++ b/qpid/python/qpid/saslmech/scram_sha_1.py
diff --git a/python/qpid/saslmech/scram_sha_256.py b/qpid/python/qpid/saslmech/scram_sha_256.py
index cc894895c0..cc894895c0 100644
--- a/python/qpid/saslmech/scram_sha_256.py
+++ b/qpid/python/qpid/saslmech/scram_sha_256.py
diff --git a/python/qpid/selector.py b/qpid/python/qpid/selector.py
index d2f4c1fc88..d2f4c1fc88 100644
--- a/python/qpid/selector.py
+++ b/qpid/python/qpid/selector.py
diff --git a/python/qpid/session.py b/qpid/python/qpid/session.py
index 95714a128a..95714a128a 100644
--- a/python/qpid/session.py
+++ b/qpid/python/qpid/session.py
diff --git a/python/qpid/spec08.py b/qpid/python/qpid/spec08.py
index a0047e7107..a0047e7107 100644
--- a/python/qpid/spec08.py
+++ b/qpid/python/qpid/spec08.py
diff --git a/python/qpid/specs/amqp-0-10-qpid-errata-stripped.xml b/qpid/python/qpid/specs/amqp-0-10-qpid-errata-stripped.xml
index 83ddf709e9..83ddf709e9 100644
--- a/python/qpid/specs/amqp-0-10-qpid-errata-stripped.xml
+++ b/qpid/python/qpid/specs/amqp-0-10-qpid-errata-stripped.xml
diff --git a/python/qpid/specs/amqp-0-10-stripped.xml b/qpid/python/qpid/specs/amqp-0-10-stripped.xml
index 1c53608138..1c53608138 100644
--- a/python/qpid/specs/amqp-0-10-stripped.xml
+++ b/qpid/python/qpid/specs/amqp-0-10-stripped.xml
diff --git a/python/qpid/specs/amqp-0-10.dtd b/qpid/python/qpid/specs/amqp-0-10.dtd
index 2be198525a..2be198525a 100644
--- a/python/qpid/specs/amqp-0-10.dtd
+++ b/qpid/python/qpid/specs/amqp-0-10.dtd
diff --git a/python/qpid/specs/amqp-0-8-qpid-stripped.xml b/qpid/python/qpid/specs/amqp-0-8-qpid-stripped.xml
index 6975e17aa6..6975e17aa6 100644
--- a/python/qpid/specs/amqp-0-8-qpid-stripped.xml
+++ b/qpid/python/qpid/specs/amqp-0-8-qpid-stripped.xml
diff --git a/python/qpid/specs/amqp-0-9-1-stripped.xml b/qpid/python/qpid/specs/amqp-0-9-1-stripped.xml
index ec55c8dd7a..ec55c8dd7a 100644
--- a/python/qpid/specs/amqp-0-9-1-stripped.xml
+++ b/qpid/python/qpid/specs/amqp-0-9-1-stripped.xml
diff --git a/python/qpid/specs/amqp-0-9-qpid-stripped.xml b/qpid/python/qpid/specs/amqp-0-9-qpid-stripped.xml
index e0075870de..e0075870de 100644
--- a/python/qpid/specs/amqp-0-9-qpid-stripped.xml
+++ b/qpid/python/qpid/specs/amqp-0-9-qpid-stripped.xml
diff --git a/python/qpid/specs_config.py b/qpid/python/qpid/specs_config.py
index d991e8b084..d991e8b084 100644
--- a/python/qpid/specs_config.py
+++ b/qpid/python/qpid/specs_config.py
diff --git a/python/qpid/testlib.py b/qpid/python/qpid/testlib.py
index 256aa7b5e6..256aa7b5e6 100644
--- a/python/qpid/testlib.py
+++ b/qpid/python/qpid/testlib.py
diff --git a/python/qpid/tests/__init__.py b/qpid/python/qpid/tests/__init__.py
index 85ab013b5a..85ab013b5a 100644
--- a/python/qpid/tests/__init__.py
+++ b/qpid/python/qpid/tests/__init__.py
diff --git a/python/qpid/tests/codec.py b/qpid/python/qpid/tests/codec.py
index 8017f794fe..8017f794fe 100644
--- a/python/qpid/tests/codec.py
+++ b/qpid/python/qpid/tests/codec.py
diff --git a/python/qpid/tests/codec010.py b/qpid/python/qpid/tests/codec010.py
index 787ebc146f..787ebc146f 100644
--- a/python/qpid/tests/codec010.py
+++ b/qpid/python/qpid/tests/codec010.py
diff --git a/python/qpid/tests/connection.py b/qpid/python/qpid/tests/connection.py
index 6847285f69..6847285f69 100644
--- a/python/qpid/tests/connection.py
+++ b/qpid/python/qpid/tests/connection.py
diff --git a/python/qpid/tests/datatypes.py b/qpid/python/qpid/tests/datatypes.py
index 00e649d6cf..00e649d6cf 100644
--- a/python/qpid/tests/datatypes.py
+++ b/qpid/python/qpid/tests/datatypes.py
diff --git a/python/qpid/tests/framing.py b/qpid/python/qpid/tests/framing.py
index 0b33df8b9a..0b33df8b9a 100644
--- a/python/qpid/tests/framing.py
+++ b/qpid/python/qpid/tests/framing.py
diff --git a/python/qpid/tests/messaging/__init__.py b/qpid/python/qpid/tests/messaging/__init__.py
index 38a5b066d6..38a5b066d6 100644
--- a/python/qpid/tests/messaging/__init__.py
+++ b/qpid/python/qpid/tests/messaging/__init__.py
diff --git a/python/qpid/tests/messaging/address.py b/qpid/python/qpid/tests/messaging/address.py
index aa9562a717..aa9562a717 100644
--- a/python/qpid/tests/messaging/address.py
+++ b/qpid/python/qpid/tests/messaging/address.py
diff --git a/python/qpid/tests/messaging/endpoints.py b/qpid/python/qpid/tests/messaging/endpoints.py
index d0103ee32c..d0103ee32c 100644
--- a/python/qpid/tests/messaging/endpoints.py
+++ b/qpid/python/qpid/tests/messaging/endpoints.py
diff --git a/python/qpid/tests/messaging/implementation.py b/qpid/python/qpid/tests/messaging/implementation.py
index fce60c6f38..fce60c6f38 100644
--- a/python/qpid/tests/messaging/implementation.py
+++ b/qpid/python/qpid/tests/messaging/implementation.py
diff --git a/python/qpid/tests/messaging/message.py b/qpid/python/qpid/tests/messaging/message.py
index bfdd2c79e5..bfdd2c79e5 100644
--- a/python/qpid/tests/messaging/message.py
+++ b/qpid/python/qpid/tests/messaging/message.py
diff --git a/python/qpid/tests/mimetype.py b/qpid/python/qpid/tests/mimetype.py
index 22760316f0..22760316f0 100644
--- a/python/qpid/tests/mimetype.py
+++ b/qpid/python/qpid/tests/mimetype.py
diff --git a/python/qpid/tests/parser.py b/qpid/python/qpid/tests/parser.py
index a4865cc9fe..a4865cc9fe 100644
--- a/python/qpid/tests/parser.py
+++ b/qpid/python/qpid/tests/parser.py
diff --git a/python/qpid/tests/queue.py b/qpid/python/qpid/tests/queue.py
index e12354eb43..e12354eb43 100644
--- a/python/qpid/tests/queue.py
+++ b/qpid/python/qpid/tests/queue.py
diff --git a/python/qpid/tests/saslmech/__init__.py b/qpid/python/qpid/tests/saslmech/__init__.py
index d8a500d9d8..d8a500d9d8 100644
--- a/python/qpid/tests/saslmech/__init__.py
+++ b/qpid/python/qpid/tests/saslmech/__init__.py
diff --git a/python/qpid/tests/saslmech/finder.py b/qpid/python/qpid/tests/saslmech/finder.py
index 3ad5e727ba..3ad5e727ba 100644
--- a/python/qpid/tests/saslmech/finder.py
+++ b/qpid/python/qpid/tests/saslmech/finder.py
diff --git a/python/qpid/tests/saslmech/my_sasl.py b/qpid/python/qpid/tests/saslmech/my_sasl.py
index c15fe4451c..c15fe4451c 100644
--- a/python/qpid/tests/saslmech/my_sasl.py
+++ b/qpid/python/qpid/tests/saslmech/my_sasl.py
diff --git a/python/qpid/tests/saslmech/my_sasl2.py b/qpid/python/qpid/tests/saslmech/my_sasl2.py
index e0b3dfa56f..e0b3dfa56f 100644
--- a/python/qpid/tests/saslmech/my_sasl2.py
+++ b/qpid/python/qpid/tests/saslmech/my_sasl2.py
diff --git a/python/qpid/tests/spec010.py b/qpid/python/qpid/tests/spec010.py
index ac04e1ee02..ac04e1ee02 100644
--- a/python/qpid/tests/spec010.py
+++ b/qpid/python/qpid/tests/spec010.py
diff --git a/python/qpid/tests/util.py b/qpid/python/qpid/tests/util.py
index 4e901218c2..4e901218c2 100644
--- a/python/qpid/tests/util.py
+++ b/qpid/python/qpid/tests/util.py
diff --git a/python/qpid/util.py b/qpid/python/qpid/util.py
index b17f13e6e6..b17f13e6e6 100644
--- a/python/qpid/util.py
+++ b/qpid/python/qpid/util.py
diff --git a/python/qpid/validator.py b/qpid/python/qpid/validator.py
index d234642b3e..d234642b3e 100644
--- a/python/qpid/validator.py
+++ b/qpid/python/qpid/validator.py
diff --git a/python/setup.py b/qpid/python/setup.py
index 9b71a98536..9b71a98536 100755
--- a/python/setup.py
+++ b/qpid/python/setup.py
diff --git a/python/todo.txt b/qpid/python/todo.txt
index 8dbe9c7cc4..8dbe9c7cc4 100644
--- a/python/todo.txt
+++ b/qpid/python/todo.txt
diff --git a/review/LICENSE b/qpid/review/LICENSE
index bc46b77047..bc46b77047 100644
--- a/review/LICENSE
+++ b/qpid/review/LICENSE
diff --git a/review/NOTICE b/qpid/review/NOTICE
index 54c534c30b..54c534c30b 100644
--- a/review/NOTICE
+++ b/qpid/review/NOTICE
diff --git a/review/agenda.py b/qpid/review/agenda.py
index 6ad20362cb..6ad20362cb 100755
--- a/review/agenda.py
+++ b/qpid/review/agenda.py
diff --git a/review/changeLogToWiki.py b/qpid/review/changeLogToWiki.py
index 4054b135df..4054b135df 100755
--- a/review/changeLogToWiki.py
+++ b/qpid/review/changeLogToWiki.py
diff --git a/review/jiraRSS2wiki.xsl b/qpid/review/jiraRSS2wiki.xsl
index bd4933cfb4..bd4933cfb4 100644
--- a/review/jiraRSS2wiki.xsl
+++ b/qpid/review/jiraRSS2wiki.xsl
diff --git a/review/svnlog2wiki.xsl b/qpid/review/svnlog2wiki.xsl
index 8fe2fbf033..8fe2fbf033 100644
--- a/review/svnlog2wiki.xsl
+++ b/qpid/review/svnlog2wiki.xsl
diff --git a/sandbox/models/fedsim/__init__.py b/qpid/sandbox/models/fedsim/__init__.py
index 63a3f41f28..63a3f41f28 100644
--- a/sandbox/models/fedsim/__init__.py
+++ b/qpid/sandbox/models/fedsim/__init__.py
diff --git a/sandbox/models/fedsim/fedsim.py b/qpid/sandbox/models/fedsim/fedsim.py
index edb6c4c8ed..edb6c4c8ed 100644
--- a/sandbox/models/fedsim/fedsim.py
+++ b/qpid/sandbox/models/fedsim/fedsim.py
diff --git a/sandbox/models/fedsim/testBig.py b/qpid/sandbox/models/fedsim/testBig.py
index 416a086983..416a086983 100644
--- a/sandbox/models/fedsim/testBig.py
+++ b/qpid/sandbox/models/fedsim/testBig.py
diff --git a/sandbox/models/fedsim/testRing.py b/qpid/sandbox/models/fedsim/testRing.py
index c883b54993..c883b54993 100644
--- a/sandbox/models/fedsim/testRing.py
+++ b/qpid/sandbox/models/fedsim/testRing.py
diff --git a/sandbox/models/fedsim/testStar.py b/qpid/sandbox/models/fedsim/testStar.py
index e6b801446f..e6b801446f 100644
--- a/sandbox/models/fedsim/testStar.py
+++ b/qpid/sandbox/models/fedsim/testStar.py
diff --git a/sandbox/models/fedsim/testStarAdd.py b/qpid/sandbox/models/fedsim/testStarAdd.py
index e0eb44952a..e0eb44952a 100644
--- a/sandbox/models/fedsim/testStarAdd.py
+++ b/qpid/sandbox/models/fedsim/testStarAdd.py
diff --git a/specs/LICENSE b/qpid/specs/LICENSE
index d645695673..d645695673 100644
--- a/specs/LICENSE
+++ b/qpid/specs/LICENSE
diff --git a/specs/MOVED_FILE b/qpid/specs/MOVED_FILE
index 91cf398302..91cf398302 100644
--- a/specs/MOVED_FILE
+++ b/qpid/specs/MOVED_FILE
diff --git a/specs/NOTICE b/qpid/specs/NOTICE
index 0e59eb3131..0e59eb3131 100644
--- a/specs/NOTICE
+++ b/qpid/specs/NOTICE
diff --git a/specs/amqp-dtx-preview.0-9.xml b/qpid/specs/amqp-dtx-preview.0-9.xml
index dd70e91d1d..dd70e91d1d 100644
--- a/specs/amqp-dtx-preview.0-9.xml
+++ b/qpid/specs/amqp-dtx-preview.0-9.xml
diff --git a/specs/amqp-errata.0-9.xml b/qpid/specs/amqp-errata.0-9.xml
index 8b9d818234..8b9d818234 100644
--- a/specs/amqp-errata.0-9.xml
+++ b/qpid/specs/amqp-errata.0-9.xml
diff --git a/specs/amqp-nogen.0-9.xml b/qpid/specs/amqp-nogen.0-9.xml
index bde9571540..bde9571540 100644
--- a/specs/amqp-nogen.0-9.xml
+++ b/qpid/specs/amqp-nogen.0-9.xml
diff --git a/specs/amqp.0-10-qpid-errata.stripped.xml b/qpid/specs/amqp.0-10-qpid-errata.stripped.xml
index 83ddf709e9..83ddf709e9 100644
--- a/specs/amqp.0-10-qpid-errata.stripped.xml
+++ b/qpid/specs/amqp.0-10-qpid-errata.stripped.xml
diff --git a/specs/amqp.0-10.dtd b/qpid/specs/amqp.0-10.dtd
index 2be198525a..2be198525a 100644
--- a/specs/amqp.0-10.dtd
+++ b/qpid/specs/amqp.0-10.dtd
diff --git a/specs/amqp.0-10.stripped.xml b/qpid/specs/amqp.0-10.stripped.xml
index 1c53608138..1c53608138 100644
--- a/specs/amqp.0-10.stripped.xml
+++ b/qpid/specs/amqp.0-10.stripped.xml
diff --git a/specs/amqp.xsl b/qpid/specs/amqp.xsl
index afe3bd5e65..afe3bd5e65 100644
--- a/specs/amqp.xsl
+++ b/qpid/specs/amqp.xsl
diff --git a/specs/amqp0-8-qpid.stripped.xml b/qpid/specs/amqp0-8-qpid.stripped.xml
index 6975e17aa6..6975e17aa6 100644
--- a/specs/amqp0-8-qpid.stripped.xml
+++ b/qpid/specs/amqp0-8-qpid.stripped.xml
diff --git a/specs/amqp0-8.stripped.xml b/qpid/specs/amqp0-8.stripped.xml
index c8497db07b..c8497db07b 100644
--- a/specs/amqp0-8.stripped.xml
+++ b/qpid/specs/amqp0-8.stripped.xml
diff --git a/specs/amqp0-9-1.stripped.xml b/qpid/specs/amqp0-9-1.stripped.xml
index ec55c8dd7a..ec55c8dd7a 100644
--- a/specs/amqp0-9-1.stripped.xml
+++ b/qpid/specs/amqp0-9-1.stripped.xml
diff --git a/specs/amqp0-9-qpid.stripped.xml b/qpid/specs/amqp0-9-qpid.stripped.xml
index e0075870de..e0075870de 100644
--- a/specs/amqp0-9-qpid.stripped.xml
+++ b/qpid/specs/amqp0-9-qpid.stripped.xml
diff --git a/specs/amqp0-9.stripped.xml b/qpid/specs/amqp0-9.stripped.xml
index 5233332b68..5233332b68 100644
--- a/specs/amqp0-9.stripped.xml
+++ b/qpid/specs/amqp0-9.stripped.xml
diff --git a/specs/apache-filters.xml b/qpid/specs/apache-filters.xml
index 644c796893..644c796893 100644
--- a/specs/apache-filters.xml
+++ b/qpid/specs/apache-filters.xml
diff --git a/specs/cluster.0-8.xml b/qpid/specs/cluster.0-8.xml
index d5b1e6cd5c..d5b1e6cd5c 100644
--- a/specs/cluster.0-8.xml
+++ b/qpid/specs/cluster.0-8.xml
diff --git a/tests/LICENSE.txt b/qpid/tests/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100644
--- a/tests/LICENSE.txt
+++ b/qpid/tests/LICENSE.txt
diff --git a/tests/MANIFEST.in b/qpid/tests/MANIFEST.in
index ab30e9acee..ab30e9acee 100644
--- a/tests/MANIFEST.in
+++ b/qpid/tests/MANIFEST.in
diff --git a/tests/NOTICE.txt b/qpid/tests/NOTICE.txt
index 695f589ffe..695f589ffe 100644
--- a/tests/NOTICE.txt
+++ b/qpid/tests/NOTICE.txt
diff --git a/tests/setup.py b/qpid/tests/setup.py
index 39d37bc69e..39d37bc69e 100755
--- a/tests/setup.py
+++ b/qpid/tests/setup.py
diff --git a/tests/src/py/qpid_tests/__init__.py b/qpid/tests/src/py/qpid_tests/__init__.py
index 7b522f59af..7b522f59af 100644
--- a/tests/src/py/qpid_tests/__init__.py
+++ b/qpid/tests/src/py/qpid_tests/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/__init__.py b/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py
index 312dc22645..312dc22645 100644
--- a/tests/src/py/qpid_tests/broker_0_10/__init__.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
index 2e2d5de13a..2e2d5de13a 100644
--- a/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/broker.py b/qpid/tests/src/py/qpid_tests/broker_0_10/broker.py
index 81d723e322..81d723e322 100644
--- a/tests/src/py/qpid_tests/broker_0_10/broker.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/broker.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/dtx.py b/qpid/tests/src/py/qpid_tests/broker_0_10/dtx.py
index a9619bcdb8..a9619bcdb8 100644
--- a/tests/src/py/qpid_tests/broker_0_10/dtx.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/dtx.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/example.py b/qpid/tests/src/py/qpid_tests/broker_0_10/example.py
index e36907d501..e36907d501 100644
--- a/tests/src/py/qpid_tests/broker_0_10/example.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/example.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
index 916f9d8b85..916f9d8b85 100644
--- a/tests/src/py/qpid_tests/broker_0_10/exchange.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/exchange.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/extensions.py b/qpid/tests/src/py/qpid_tests/broker_0_10/extensions.py
index 50c0aa3dd1..50c0aa3dd1 100644
--- a/tests/src/py/qpid_tests/broker_0_10/extensions.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/extensions.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/lvq.py b/qpid/tests/src/py/qpid_tests/broker_0_10/lvq.py
index 07a8906fe7..07a8906fe7 100644
--- a/tests/src/py/qpid_tests/broker_0_10/lvq.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/lvq.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/management.py b/qpid/tests/src/py/qpid_tests/broker_0_10/management.py
index 751839291b..751839291b 100644
--- a/tests/src/py/qpid_tests/broker_0_10/management.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/management.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/message.py b/qpid/tests/src/py/qpid_tests/broker_0_10/message.py
index c6095a0579..c6095a0579 100644
--- a/tests/src/py/qpid_tests/broker_0_10/message.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/message.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/msg_groups.py b/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py
index ec015e1be4..ec015e1be4 100644
--- a/tests/src/py/qpid_tests/broker_0_10/msg_groups.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/msg_groups.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/new_api.py b/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py
index 4e94395121..4e94395121 100644
--- a/tests/src/py/qpid_tests/broker_0_10/new_api.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/new_api.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/persistence.py b/qpid/tests/src/py/qpid_tests/broker_0_10/persistence.py
index e9cf9b7caa..e9cf9b7caa 100644
--- a/tests/src/py/qpid_tests/broker_0_10/persistence.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/persistence.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/priority.py b/qpid/tests/src/py/qpid_tests/broker_0_10/priority.py
index 47aae6dfd6..47aae6dfd6 100644
--- a/tests/src/py/qpid_tests/broker_0_10/priority.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/priority.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/qmf_events.py b/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
index 7ab7b0a1ac..7ab7b0a1ac 100644
--- a/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/qmf_events.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/query.py b/qpid/tests/src/py/qpid_tests/broker_0_10/query.py
index fd741821d5..fd741821d5 100644
--- a/tests/src/py/qpid_tests/broker_0_10/query.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/query.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/queue.py b/qpid/tests/src/py/qpid_tests/broker_0_10/queue.py
index 132bd7b987..132bd7b987 100644
--- a/tests/src/py/qpid_tests/broker_0_10/queue.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/queue.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/stats.py b/qpid/tests/src/py/qpid_tests/broker_0_10/stats.py
index 4f3931b78b..4f3931b78b 100644
--- a/tests/src/py/qpid_tests/broker_0_10/stats.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/stats.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/threshold.py b/qpid/tests/src/py/qpid_tests/broker_0_10/threshold.py
index fa172c66d2..fa172c66d2 100644
--- a/tests/src/py/qpid_tests/broker_0_10/threshold.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/threshold.py
diff --git a/tests/src/py/qpid_tests/broker_0_10/tx.py b/qpid/tests/src/py/qpid_tests/broker_0_10/tx.py
index 8cdc539a08..8cdc539a08 100644
--- a/tests/src/py/qpid_tests/broker_0_10/tx.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_10/tx.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/__init__.py b/qpid/tests/src/py/qpid_tests/broker_0_8/__init__.py
index 526f2452f8..526f2452f8 100644
--- a/tests/src/py/qpid_tests/broker_0_8/__init__.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/basic.py b/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py
index 13f4252ffb..13f4252ffb 100644
--- a/tests/src/py/qpid_tests/broker_0_8/basic.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/basic.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/broker.py b/qpid/tests/src/py/qpid_tests/broker_0_8/broker.py
index 7f3fe7530e..7f3fe7530e 100644
--- a/tests/src/py/qpid_tests/broker_0_8/broker.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/broker.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/example.py b/qpid/tests/src/py/qpid_tests/broker_0_8/example.py
index d82bad1f61..d82bad1f61 100644
--- a/tests/src/py/qpid_tests/broker_0_8/example.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/example.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/exchange.py b/qpid/tests/src/py/qpid_tests/broker_0_8/exchange.py
index 8d610a79dd..8d610a79dd 100644
--- a/tests/src/py/qpid_tests/broker_0_8/exchange.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/exchange.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/queue.py b/qpid/tests/src/py/qpid_tests/broker_0_8/queue.py
index b7a41736ab..b7a41736ab 100644
--- a/tests/src/py/qpid_tests/broker_0_8/queue.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/queue.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/testlib.py b/qpid/tests/src/py/qpid_tests/broker_0_8/testlib.py
index 76f7e964a2..76f7e964a2 100644
--- a/tests/src/py/qpid_tests/broker_0_8/testlib.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/testlib.py
diff --git a/tests/src/py/qpid_tests/broker_0_8/tx.py b/qpid/tests/src/py/qpid_tests/broker_0_8/tx.py
index 9faddb1110..9faddb1110 100644
--- a/tests/src/py/qpid_tests/broker_0_8/tx.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_8/tx.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/__init__.py b/qpid/tests/src/py/qpid_tests/broker_0_9/__init__.py
index 72e69a51b9..72e69a51b9 100644
--- a/tests/src/py/qpid_tests/broker_0_9/__init__.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_9/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/echo.py b/qpid/tests/src/py/qpid_tests/broker_0_9/echo.py
index a883568e35..a883568e35 100644
--- a/tests/src/py/qpid_tests/broker_0_9/echo.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_9/echo.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/messageheader.py b/qpid/tests/src/py/qpid_tests/broker_0_9/messageheader.py
index 3d64adfcf0..3d64adfcf0 100644
--- a/tests/src/py/qpid_tests/broker_0_9/messageheader.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_9/messageheader.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/query.py b/qpid/tests/src/py/qpid_tests/broker_0_9/query.py
index cb66d079e5..cb66d079e5 100644
--- a/tests/src/py/qpid_tests/broker_0_9/query.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_9/query.py
diff --git a/tests/src/py/qpid_tests/broker_0_9/queue.py b/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
index 249850caf9..249850caf9 100644
--- a/tests/src/py/qpid_tests/broker_0_9/queue.py
+++ b/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/__init__.py b/qpid/tests/src/py/qpid_tests/broker_1_0/__init__.py
index b14bb96dc8..b14bb96dc8 100644
--- a/tests/src/py/qpid_tests/broker_1_0/__init__.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/__init__.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/general.py b/qpid/tests/src/py/qpid_tests/broker_1_0/general.py
index 414d0b48f5..414d0b48f5 100644
--- a/tests/src/py/qpid_tests/broker_1_0/general.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/general.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/legacy_exchanges.py b/qpid/tests/src/py/qpid_tests/broker_1_0/legacy_exchanges.py
index eefa49e817..eefa49e817 100644
--- a/tests/src/py/qpid_tests/broker_1_0/legacy_exchanges.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/legacy_exchanges.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/selector.py b/qpid/tests/src/py/qpid_tests/broker_1_0/selector.py
index ac2bbd8db3..ac2bbd8db3 100644
--- a/tests/src/py/qpid_tests/broker_1_0/selector.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/selector.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/translation.py b/qpid/tests/src/py/qpid_tests/broker_1_0/translation.py
index a6394fb8c5..a6394fb8c5 100644
--- a/tests/src/py/qpid_tests/broker_1_0/translation.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/translation.py
diff --git a/tests/src/py/qpid_tests/broker_1_0/tx.py b/qpid/tests/src/py/qpid_tests/broker_1_0/tx.py
index 45817fc64f..45817fc64f 100644
--- a/tests/src/py/qpid_tests/broker_1_0/tx.py
+++ b/qpid/tests/src/py/qpid_tests/broker_1_0/tx.py
diff --git a/tests/src/py/qpid_tests/client/client-api-example-tests.py b/qpid/tests/src/py/qpid_tests/client/client-api-example-tests.py
index 43e0aada46..43e0aada46 100755
--- a/tests/src/py/qpid_tests/client/client-api-example-tests.py
+++ b/qpid/tests/src/py/qpid_tests/client/client-api-example-tests.py
diff --git a/tests/src/py/qpid_tests/client/log4j.conf b/qpid/tests/src/py/qpid_tests/client/log4j.conf
index 2c7bd74e29..2c7bd74e29 100644
--- a/tests/src/py/qpid_tests/client/log4j.conf
+++ b/qpid/tests/src/py/qpid_tests/client/log4j.conf
diff --git a/tools/.gitignore b/qpid/tools/.gitignore
index 846f2ac5b0..846f2ac5b0 100644
--- a/tools/.gitignore
+++ b/qpid/tools/.gitignore
diff --git a/tools/LICENSE.txt b/qpid/tools/LICENSE.txt
index 6b0b1270ff..6b0b1270ff 100644
--- a/tools/LICENSE.txt
+++ b/qpid/tools/LICENSE.txt
diff --git a/tools/MANIFEST.in b/qpid/tools/MANIFEST.in
index ab30e9acee..ab30e9acee 100644
--- a/tools/MANIFEST.in
+++ b/qpid/tools/MANIFEST.in
diff --git a/tools/NOTICE.txt b/qpid/tools/NOTICE.txt
index a3fa8a06bf..a3fa8a06bf 100644
--- a/tools/NOTICE.txt
+++ b/qpid/tools/NOTICE.txt
diff --git a/tools/setup.py b/qpid/tools/setup.py
index aa075757f9..aa075757f9 100755
--- a/tools/setup.py
+++ b/qpid/tools/setup.py
diff --git a/tools/src/java/LICENSE b/qpid/tools/src/java/LICENSE
index 9f8ad3766d..9f8ad3766d 100644
--- a/tools/src/java/LICENSE
+++ b/qpid/tools/src/java/LICENSE
diff --git a/tools/src/java/NOTICE b/qpid/tools/src/java/NOTICE
index cac16200cc..cac16200cc 100644
--- a/tools/src/java/NOTICE
+++ b/qpid/tools/src/java/NOTICE
diff --git a/tools/src/java/README.txt b/qpid/tools/src/java/README.txt
index 60beaf303b..60beaf303b 100644
--- a/tools/src/java/README.txt
+++ b/qpid/tools/src/java/README.txt
diff --git a/tools/src/java/pom.xml b/qpid/tools/src/java/pom.xml
index 5d8fcbb0ad..5d8fcbb0ad 100644
--- a/tools/src/java/pom.xml
+++ b/qpid/tools/src/java/pom.xml
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt
index d6f46a895f..d6f46a895f 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/README.txt
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
index 6af69a6875..6af69a6875 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/pom.xml
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE
index 6b108e5ecb..6b108e5ecb 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/LICENSE
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE
index e53b688a9c..e53b688a9c 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/NOTICE
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index 92a50821b9..92a50821b9 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml
index 29180fd248..29180fd248 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/assembly/qpid-broker-plugins-management-qmf2-bin.xml
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
index 1e10170700..1e10170700 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementAgent.java
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPlugin.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPlugin.java
index f9ab9abd0c..f9ab9abd0c 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPlugin.java
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPlugin.java
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java
index 52ea0afa10..52ea0afa10 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/QmfManagementPluginImpl.java
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Binding.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Binding.java
index e65d2734a7..e65d2734a7 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Binding.java
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Binding.java
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
index 5c4dcc6b06..5c4dcc6b06 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Broker.java
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Connection.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Connection.java
index 0dc9ba4975..0dc9ba4975 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Connection.java
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Connection.java
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
index b5e1f662db..b5e1f662db 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Exchange.java
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Queue.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
index aad85e66e9..aad85e66e9 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Queue.java
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Session.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Session.java
index ea7bece7c0..ea7bece7c0 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Session.java
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Session.java
diff --git a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java
index bdfe6cca37..bdfe6cca37 100644
--- a/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java
+++ b/qpid/tools/src/java/qpid-broker-plugins-management-qmf2/src/main/java/org/apache/qpid/server/qmf2/agentdata/Subscription.java
diff --git a/tools/src/java/qpid-qmf2-rest/pom.xml b/qpid/tools/src/java/qpid-qmf2-rest/pom.xml
index b0735250d9..b0735250d9 100644
--- a/tools/src/java/qpid-qmf2-rest/pom.xml
+++ b/qpid/tools/src/java/qpid-qmf2-rest/pom.xml
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/ConnectionProxy.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/ConnectionProxy.java
index 435372a0d6..435372a0d6 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/ConnectionProxy.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/ConnectionProxy.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/ConnectionStore.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/ConnectionStore.java
index 79b85c9c42..79b85c9c42 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/ConnectionStore.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/ConnectionStore.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/FileServer.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/FileServer.java
index 2cbb1140b1..2cbb1140b1 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/FileServer.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/FileServer.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/HttpTransaction.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/HttpTransaction.java
index 323ba29861..323ba29861 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/HttpTransaction.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/HttpTransaction.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/JSON.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/JSON.java
index dfc1e0c85d..dfc1e0c85d 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/JSON.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/JSON.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/JSONMapParser.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/JSONMapParser.java
index 9a6354e099..9a6354e099 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/JSONMapParser.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/JSONMapParser.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/QpidRestAPI.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/QpidRestAPI.java
index b7ff7d9cfe..b7ff7d9cfe 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/QpidRestAPI.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/QpidRestAPI.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/QpidServer.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/QpidServer.java
index f1bdcf85bc..f1bdcf85bc 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/QpidServer.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/QpidServer.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/Server.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/Server.java
index e7f5d61219..e7f5d61219 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/Server.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/Server.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/Authenticator.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/Authenticator.java
index 1083cb48df..1083cb48df 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/Authenticator.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/Authenticator.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/Delegator.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/Delegator.java
index 9dfd1fea0c..9dfd1fea0c 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/Delegator.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/Delegator.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/HttpExchangeTransaction.java b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/HttpExchangeTransaction.java
index 78932ec399..78932ec399 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/HttpExchangeTransaction.java
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/httpserver/HttpExchangeTransaction.java
diff --git a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/servlet/TODO b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/servlet/TODO
index 9da5ee871a..9da5ee871a 100644
--- a/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/servlet/TODO
+++ b/qpid/tools/src/java/qpid-qmf2-rest/src/main/java/org/apache/qpid/restapi/servlet/TODO
diff --git a/tools/src/java/qpid-qmf2-test/README.txt b/qpid/tools/src/java/qpid-qmf2-test/README.txt
index bdc9d532b6..bdc9d532b6 100644
--- a/tools/src/java/qpid-qmf2-test/README.txt
+++ b/qpid/tools/src/java/qpid-qmf2-test/README.txt
diff --git a/tools/src/java/qpid-qmf2-test/log4j.xml b/qpid/tools/src/java/qpid-qmf2-test/log4j.xml
index d5169932bc..d5169932bc 100644
--- a/tools/src/java/qpid-qmf2-test/log4j.xml
+++ b/qpid/tools/src/java/qpid-qmf2-test/log4j.xml
diff --git a/tools/src/java/qpid-qmf2-test/pom.xml b/qpid/tools/src/java/qpid-qmf2-test/pom.xml
index 8b71c093cf..8b71c093cf 100644
--- a/tools/src/java/qpid-qmf2-test/pom.xml
+++ b/qpid/tools/src/java/qpid-qmf2-test/pom.xml
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentExternalTest.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentExternalTest.java
index 3094ba406f..3094ba406f 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentExternalTest.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentExternalTest.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentSubscriptionTestConsole.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentSubscriptionTestConsole.java
index 3bc84e1ee9..3bc84e1ee9 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentSubscriptionTestConsole.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentSubscriptionTestConsole.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentTest.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentTest.java
index 8aebe76937..8aebe76937 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentTest.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentTest.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentTestConsole.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentTestConsole.java
index edae41bcf4..edae41bcf4 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentTestConsole.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/AgentTestConsole.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BigPayloadAgentTest.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BigPayloadAgentTest.java
index a6613464b5..a6613464b5 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BigPayloadAgentTest.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BigPayloadAgentTest.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BigPayloadAgentTestConsole.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BigPayloadAgentTestConsole.java
index 4457dea5e5..4457dea5e5 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BigPayloadAgentTestConsole.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BigPayloadAgentTestConsole.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BrokerSubscriptionTestConsole.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BrokerSubscriptionTestConsole.java
index 27eadbaac8..27eadbaac8 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BrokerSubscriptionTestConsole.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/BrokerSubscriptionTestConsole.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/InvokeMethodTest.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/InvokeMethodTest.java
index 8b175e3ca6..8b175e3ca6 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/InvokeMethodTest.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/InvokeMethodTest.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/PartialGetObjectsTest.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/PartialGetObjectsTest.java
index e42879947b..e42879947b 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/PartialGetObjectsTest.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/PartialGetObjectsTest.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/SchemaTest.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/SchemaTest.java
index f510bb201c..f510bb201c 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/SchemaTest.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/SchemaTest.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test1.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test1.java
index f71f4cdf32..f71f4cdf32 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test1.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test1.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test2.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test2.java
index 11924f824d..11924f824d 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test2.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test2.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test3.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test3.java
index fdb9180d36..fdb9180d36 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test3.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test3.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test4.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test4.java
index 29a8ba8f88..29a8ba8f88 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test4.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/Test4.java
diff --git a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/URLTest.java b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/URLTest.java
index 35bd9f537b..35bd9f537b 100644
--- a/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/URLTest.java
+++ b/qpid/tools/src/java/qpid-qmf2-test/src/main/java/org/apache/qpid/qmf2/test/URLTest.java
diff --git a/tools/src/java/qpid-qmf2-tools/README.txt b/qpid/tools/src/java/qpid-qmf2-tools/README.txt
index cce2fcf00e..cce2fcf00e 100644
--- a/tools/src/java/qpid-qmf2-tools/README.txt
+++ b/qpid/tools/src/java/qpid-qmf2-tools/README.txt
diff --git a/tools/src/java/qpid-qmf2-tools/bin/ConnectionAudit.sh b/qpid/tools/src/java/qpid-qmf2-tools/bin/ConnectionAudit.sh
index 69894edc42..69894edc42 100755
--- a/tools/src/java/qpid-qmf2-tools/bin/ConnectionAudit.sh
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/ConnectionAudit.sh
diff --git a/tools/src/java/qpid-qmf2-tools/bin/ConnectionLogger.sh b/qpid/tools/src/java/qpid-qmf2-tools/bin/ConnectionLogger.sh
index 41bc1e5b2f..41bc1e5b2f 100755
--- a/tools/src/java/qpid-qmf2-tools/bin/ConnectionLogger.sh
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/ConnectionLogger.sh
diff --git a/tools/src/java/qpid-qmf2-tools/bin/QpidConfig.sh b/qpid/tools/src/java/qpid-qmf2-tools/bin/QpidConfig.sh
index f6a475f5e7..f6a475f5e7 100755
--- a/tools/src/java/qpid-qmf2-tools/bin/QpidConfig.sh
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/QpidConfig.sh
diff --git a/tools/src/java/qpid-qmf2-tools/bin/QpidCtrl.sh b/qpid/tools/src/java/qpid-qmf2-tools/bin/QpidCtrl.sh
index 760974a2af..760974a2af 100755
--- a/tools/src/java/qpid-qmf2-tools/bin/QpidCtrl.sh
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/QpidCtrl.sh
diff --git a/tools/src/java/qpid-qmf2-tools/bin/QpidPrintEvents.sh b/qpid/tools/src/java/qpid-qmf2-tools/bin/QpidPrintEvents.sh
index 52c21431f3..52c21431f3 100755
--- a/tools/src/java/qpid-qmf2-tools/bin/QpidPrintEvents.sh
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/QpidPrintEvents.sh
diff --git a/tools/src/java/qpid-qmf2-tools/bin/QpidQueueStats.sh b/qpid/tools/src/java/qpid-qmf2-tools/bin/QpidQueueStats.sh
index e63764058e..e63764058e 100755
--- a/tools/src/java/qpid-qmf2-tools/bin/QpidQueueStats.sh
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/QpidQueueStats.sh
diff --git a/tools/src/java/qpid-qmf2-tools/bin/QpidRestAPI.sh b/qpid/tools/src/java/qpid-qmf2-tools/bin/QpidRestAPI.sh
index 5a1254d632..5a1254d632 100755
--- a/tools/src/java/qpid-qmf2-tools/bin/QpidRestAPI.sh
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/QpidRestAPI.sh
diff --git a/tools/src/java/qpid-qmf2-tools/bin/QueueFuse.sh b/qpid/tools/src/java/qpid-qmf2-tools/bin/QueueFuse.sh
index c7c8ebed16..c7c8ebed16 100755
--- a/tools/src/java/qpid-qmf2-tools/bin/QueueFuse.sh
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/QueueFuse.sh
diff --git a/tools/src/java/qpid-qmf2-tools/bin/log4j.xml b/qpid/tools/src/java/qpid-qmf2-tools/bin/log4j.xml
index 434bb73259..434bb73259 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/log4j.xml
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/log4j.xml
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/authentication/account.properties b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/authentication/account.properties
index ff30bdc55c..ff30bdc55c 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/authentication/account.properties
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/authentication/account.properties
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/apple-touch-icon.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/apple-touch-icon.png
index ad4478ccac..ad4478ccac 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/apple-touch-icon.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/apple-touch-icon.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/favicon.ico b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/favicon.ico
index 1f61b0edd2..1f61b0edd2 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/favicon.ico
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/favicon.ico
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/index.html b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/index.html
index e21871b59f..e21871b59f 100755
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/index.html
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/index.html
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie6.css b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie6.css
index 343192efd6..343192efd6 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie6.css
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie6.css
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie7.css b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie7.css
index d8bd020662..d8bd020662 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie7.css
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie7.css
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie8.css b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie8.css
index f2cb4d8126..f2cb4d8126 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie8.css
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie8.css
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie9.css b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie9.css
index 3ad857559e..3ad857559e 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie9.css
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet-ie9.css
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet.css b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet.css
index 6ed4d3d7d3..6ed4d3d7d3 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet.css
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/css/itablet.css
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/action.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/action.png
index af5e0378b0..af5e0378b0 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/action.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/action.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/add.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/add.png
index 700d9f100e..700d9f100e 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/add.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/add.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/bin.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/bin.png
index 90923898af..90923898af 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/bin.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/bin.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blue-button-sprite.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blue-button-sprite.png
index 9fedd12867..9fedd12867 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blue-button-sprite.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blue-button-sprite.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blue-chevron.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blue-chevron.png
index 41e539fc10..41e539fc10 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blue-chevron.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blue-chevron.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blueball.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blueball.png
index a7c4c68349..a7c4c68349 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blueball.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/blueball.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/button-sprite.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/button-sprite.png
index c15b4ea217..c15b4ea217 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/button-sprite.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/button-sprite.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/chevron-active.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/chevron-active.png
index 86832ebc7b..86832ebc7b 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/chevron-active.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/chevron-active.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/chevron.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/chevron.png
index 6421a16762..6421a16762 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/chevron.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/chevron.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/delete.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/delete.png
index 74b1ff3ea1..74b1ff3ea1 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/delete.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/delete.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/flag.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/flag.png
index 0baf2a9986..0baf2a9986 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/flag.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/flag.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/home.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/home.png
index 4f359778a2..4f359778a2 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/home.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/home.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/active-gradient.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/active-gradient.png
index 6cd4404965..6cd4404965 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/active-gradient.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/active-gradient.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/blue-button-sprite.gif b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/blue-button-sprite.gif
index 8edaddedd8..8edaddedd8 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/blue-button-sprite.gif
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/blue-button-sprite.gif
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/blue-chevron.gif b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/blue-chevron.gif
index bb8f3d51d6..bb8f3d51d6 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/blue-chevron.gif
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/blue-chevron.gif
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/button-sprite.gif b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/button-sprite.gif
index 5e920511d1..5e920511d1 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/button-sprite.gif
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/button-sprite.gif
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/chevron-active.gif b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/chevron-active.gif
index f37329bb3b..f37329bb3b 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/chevron-active.gif
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/chevron-active.gif
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/chevron.gif b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/chevron.gif
index dce238269a..dce238269a 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/chevron.gif
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/chevron.gif
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/header-gradient.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/header-gradient.png
index d4e9a6c9f0..d4e9a6c9f0 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/header-gradient.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/header-gradient.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radial-gradient.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radial-gradient.png
index d9ab361add..d9ab361add 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radial-gradient.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radial-gradient.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radius-10px-sprite.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radius-10px-sprite.png
index ca91770e2f..ca91770e2f 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radius-10px-sprite.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radius-10px-sprite.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radius-5px-sprite.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radius-5px-sprite.png
index c00e2194db..c00e2194db 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radius-5px-sprite.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/radius-5px-sprite.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/red6.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/red6.png
index c1c0ba1db9..c1c0ba1db9 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/red6.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/red6.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/smoked.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/smoked.png
index ea6b7c587f..ea6b7c587f 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/smoked.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/smoked.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/tick-active.gif b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/tick-active.gif
index 629f6f1eca..629f6f1eca 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/tick-active.gif
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/tick-active.gif
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/tick.gif b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/tick.gif
index fdbdc1eec2..fdbdc1eec2 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/tick.gif
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/tick.gif
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/transparent.gif b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/transparent.gif
index c5b2954ac6..c5b2954ac6 100755
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/transparent.gif
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/transparent.gif
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/transparent.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/transparent.png
index 8ac7f64f1a..8ac7f64f1a 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/transparent.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/ie/transparent.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/mask.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/mask.png
index f8be0e6f36..f8be0e6f36 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/mask.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/mask.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/move.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/move.png
index 80f77eeb72..80f77eeb72 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/move.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/move.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/on_off.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/on_off.png
index 89243bf27d..89243bf27d 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/on_off.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/on_off.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/tick-active.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/tick-active.png
index 16fa8ca71b..16fa8ca71b 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/tick-active.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/tick-active.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/tick.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/tick.png
index 783b60fe9a..783b60fe9a 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/tick.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/tick.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-off.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-off.png
index 474ad3cd63..474ad3cd63 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-off.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-off.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-on-border.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-on-border.png
index 7680cd7d0a..7680cd7d0a 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-on-border.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-on-border.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-on.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-on.png
index 275aa42114..275aa42114 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-on.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/toggle-on.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/write.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/write.png
index b7329dbf9f..b7329dbf9f 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/write.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/images/write.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/LICENCE b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/LICENCE
index 7d95218a1e..7d95218a1e 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/LICENCE
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/LICENCE
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/iscroll.js b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/iscroll.js
index 46330e51f7..46330e51f7 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/iscroll.js
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/iscroll.js
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/itablet.js b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/itablet.js
index c6f84bcf53..c6f84bcf53 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/itablet.js
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/itablet.js
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/jquery.js b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/jquery.js
index 198b3ff07d..198b3ff07d 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/jquery.js
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/itablet/scripts/jquery.js
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/css/index.css b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/css/index.css
index 0032bedca1..0032bedca1 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/css/index.css
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/css/index.css
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/css/qmf.css b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/css/qmf.css
index 11ca7fad12..11ca7fad12 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/css/qmf.css
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/css/qmf.css
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/brokers.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/brokers.png
index 72efa7ab11..72efa7ab11 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/brokers.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/brokers.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/connections.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/connections.png
index 2e1d422d0a..2e1d422d0a 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/connections.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/connections.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/events.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/events.png
index 1e5a7ee5ca..1e5a7ee5ca 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/events.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/events.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/exchanges.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/exchanges.png
index 5f15dbbfdc..5f15dbbfdc 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/exchanges.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/exchanges.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/gradient.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/gradient.png
index 260a05701f..260a05701f 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/gradient.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/gradient.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/links.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/links.png
index d8ad7af518..d8ad7af518 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/links.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/links.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/loading.gif b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/loading.gif
index 3288d1035d..3288d1035d 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/loading.gif
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/loading.gif
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/qpid-logo.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/qpid-logo.png
index d548b68245..d548b68245 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/qpid-logo.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/qpid-logo.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/queues.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/queues.png
index 4f72abfe50..4f72abfe50 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/queues.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/queues.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/route-topology.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/route-topology.png
index c1b36d4077..c1b36d4077 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/route-topology.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/route-topology.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/settings.png b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/settings.png
index 6994d4a0d4..6994d4a0d4 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/settings.png
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/images/settings.png
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/LICENCE b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/LICENCE
index e90b016701..e90b016701 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/LICENCE
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/LICENCE
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/excanvas.js b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/excanvas.js
index a6d9ddf5fa..a6d9ddf5fa 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/excanvas.js
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/excanvas.js
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
index 4c24b44dbb..4c24b44dbb 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qmf-ui/scripts/qmf-ui.js
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qpid/scripts/LICENCE b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qpid/scripts/LICENCE
index e62925ae88..e62925ae88 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qpid/scripts/LICENCE
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qpid/scripts/LICENCE
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qpid/scripts/qpid.js b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qpid/scripts/qpid.js
index f1ad4711f2..f1ad4711f2 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qpid/scripts/qpid.js
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/qpid/scripts/qpid.js
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/config.js b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/config.js
index a37de988ca..a37de988ca 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/config.js
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/config.js
diff --git a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/qmf.html b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/qmf.html
index 60977fbad0..60977fbad0 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/qmf.html
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/qpid-web/web/ui/qmf.html
diff --git a/tools/src/java/qpid-qmf2-tools/bin/whitelist.xml b/qpid/tools/src/java/qpid-qmf2-tools/bin/whitelist.xml
index 5c39c50d43..5c39c50d43 100644
--- a/tools/src/java/qpid-qmf2-tools/bin/whitelist.xml
+++ b/qpid/tools/src/java/qpid-qmf2-tools/bin/whitelist.xml
diff --git a/tools/src/java/qpid-qmf2-tools/pom.xml b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
index a83cae1cf5..a83cae1cf5 100644
--- a/tools/src/java/qpid-qmf2-tools/pom.xml
+++ b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE
index ec8bdec6e5..ec8bdec6e5 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/LICENSE
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE
index 49bf4f36af..49bf4f36af 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/NOTICE
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index 424f175b33..424f175b33 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml
index cce56c0725..cce56c0725 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java
index 7f6109cb7a..7f6109cb7a 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionAudit.java
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java
index f9364b4069..f9364b4069 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/ConnectionLogger.java
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
index e4262b0577..e4262b0577 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidConfig.java
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java
index fa06b06519..fa06b06519 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidCtrl.java
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java
index 34a38bf8d7..34a38bf8d7 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidPrintEvents.java
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java
index 4ac434dc17..4ac434dc17 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QpidQueueStats.java
diff --git a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java
index 31368ed242..31368ed242 100644
--- a/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/java/org/apache/qpid/qmf2/tools/QueueFuse.java
diff --git a/tools/src/java/qpid-qmf2/pom.xml b/qpid/tools/src/java/qpid-qmf2/pom.xml
index 5d8a58e920..5d8a58e920 100644
--- a/tools/src/java/qpid-qmf2/pom.xml
+++ b/qpid/tools/src/java/qpid-qmf2/pom.xml
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/Agent.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/Agent.java
index 80acf93e55..80acf93e55 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/Agent.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/Agent.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/AgentExternal.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/AgentExternal.java
index 25b2db3d69..25b2db3d69 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/AgentExternal.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/AgentExternal.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/MethodCallParams.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/MethodCallParams.java
index 1f69709225..1f69709225 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/MethodCallParams.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/MethodCallParams.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/MethodCallWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/MethodCallWorkItem.java
index cde10902e6..cde10902e6 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/MethodCallWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/MethodCallWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/QmfAgentData.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/QmfAgentData.java
index 974c5746e2..974c5746e2 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/QmfAgentData.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/QmfAgentData.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/QueryWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/QueryWorkItem.java
index d617307c20..d617307c20 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/QueryWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/QueryWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeParams.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeParams.java
index 475b378b75..475b378b75 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeParams.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeParams.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeRequestWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeRequestWorkItem.java
index 2ec9ed2c9c..2ec9ed2c9c 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeRequestWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/ResubscribeRequestWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscribableAgent.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscribableAgent.java
index 619d00df7b..619d00df7b 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscribableAgent.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscribableAgent.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscribeRequestWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscribeRequestWorkItem.java
index a9c4816aba..a9c4816aba 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscribeRequestWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscribeRequestWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/Subscription.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/Subscription.java
index 2f49702c7c..2f49702c7c 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/Subscription.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/Subscription.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscriptionParams.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscriptionParams.java
index 1cc2a9a5d1..1cc2a9a5d1 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscriptionParams.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/SubscriptionParams.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/UnsubscribeRequestWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/UnsubscribeRequestWorkItem.java
index 45f316b1b4..45f316b1b4 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/UnsubscribeRequestWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/UnsubscribeRequestWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfData.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfData.png
index 2665803e39..2665803e39 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfData.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfData.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfEventListenerModel.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfEventListenerModel.png
index 26a5f71b56..26a5f71b56 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfEventListenerModel.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfEventListenerModel.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfQuery.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfQuery.png
index 9e471a08c0..9e471a08c0 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfQuery.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/QmfQuery.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Schema.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Schema.png
index b0277f4fc5..b0277f4fc5 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Schema.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Schema.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Subscriptions.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Subscriptions.png
index d43370e4ef..d43370e4ef 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Subscriptions.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/Subscriptions.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/WorkQueueEventModel.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/WorkQueueEventModel.png
index fc2a722985..fc2a722985 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/WorkQueueEventModel.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/agent/doc-files/WorkQueueEventModel.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/AMQPMessage.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/AMQPMessage.java
index 94b539c0b3..94b539c0b3 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/AMQPMessage.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/AMQPMessage.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BlockingNotifier.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BlockingNotifier.java
index 634a5e60b0..634a5e60b0 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BlockingNotifier.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BlockingNotifier.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanEquals.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanEquals.java
index 4eba04cc03..4eba04cc03 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanEquals.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanEquals.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanExists.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanExists.java
index 522748ebb6..522748ebb6 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanExists.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanExists.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanExpression.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanExpression.java
index 999dd6d222..999dd6d222 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanExpression.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanExpression.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanFalse.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanFalse.java
index 00080dfb10..00080dfb10 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanFalse.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanFalse.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterEqual.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterEqual.java
index 7aaeb8e687..7aaeb8e687 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterEqual.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterEqual.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterThan.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterThan.java
index 2ac44f35ec..2ac44f35ec 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterThan.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanGreaterThan.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanLessEqual.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanLessEqual.java
index 2461f116d9..2461f116d9 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanLessEqual.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanLessEqual.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanLessThan.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanLessThan.java
index 1a65119e59..1a65119e59 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanLessThan.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanLessThan.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanNotEquals.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanNotEquals.java
index a72a467c1f..a72a467c1f 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanNotEquals.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanNotEquals.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanRegexMatch.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanRegexMatch.java
index 30311ba712..30311ba712 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanRegexMatch.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanRegexMatch.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanTrue.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanTrue.java
index b092e7daaf..b092e7daaf 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanTrue.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/BooleanTrue.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Expression.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Expression.java
index 4e92af911b..4e92af911b 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Expression.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Expression.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Handle.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Handle.java
index 7f81b06900..7f81b06900 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Handle.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Handle.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalAnd.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalAnd.java
index 12b9f3d093..12b9f3d093 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalAnd.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalAnd.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalExpression.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalExpression.java
index 23a5ac3abd..23a5ac3abd 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalExpression.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalExpression.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalNot.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalNot.java
index 029ea00af9..029ea00af9 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalNot.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalNot.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalOr.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalOr.java
index 72c8c1ff15..72c8c1ff15 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalOr.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/LogicalOr.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Notifier.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Notifier.java
index ecdce269b4..ecdce269b4 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Notifier.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/Notifier.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/NotifierWrapper.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/NotifierWrapper.java
index 42bb9cc9d7..42bb9cc9d7 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/NotifierWrapper.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/NotifierWrapper.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/NullQmfEventListener.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/NullQmfEventListener.java
index 447adbe391..447adbe391 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/NullQmfEventListener.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/NullQmfEventListener.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/ObjectId.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/ObjectId.java
index b84822def7..b84822def7 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/ObjectId.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/ObjectId.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfCallback.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfCallback.java
index d57282b2e7..d57282b2e7 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfCallback.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfCallback.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfData.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfData.java
index c634564ba4..c634564ba4 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfData.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfData.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfDescribed.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfDescribed.java
index c81f674d1f..c81f674d1f 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfDescribed.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfDescribed.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfEvent.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfEvent.java
index 06c19ca0ab..06c19ca0ab 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfEvent.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfEvent.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfEventListener.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfEventListener.java
index c6b1c14350..c6b1c14350 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfEventListener.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfEventListener.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfException.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfException.java
index aa397e6116..aa397e6116 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfException.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfException.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfManaged.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfManaged.java
index 44dbcef9bf..44dbcef9bf 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfManaged.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfManaged.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfQuery.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfQuery.java
index e9b8e13deb..e9b8e13deb 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfQuery.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfQuery.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfQueryTarget.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfQueryTarget.java
index 01aba88bfc..01aba88bfc 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfQueryTarget.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfQueryTarget.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfType.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfType.java
index a19ebcf393..a19ebcf393 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfType.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/QmfType.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaClass.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaClass.java
index 045628dc1a..045628dc1a 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaClass.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaClass.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaClassId.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaClassId.java
index 5ad4ba8249..5ad4ba8249 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaClassId.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaClassId.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaEventClass.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaEventClass.java
index c563c63362..c563c63362 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaEventClass.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaEventClass.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaMethod.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaMethod.java
index c1db746851..c1db746851 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaMethod.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaMethod.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaObjectClass.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaObjectClass.java
index 734d040be6..734d040be6 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaObjectClass.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaObjectClass.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaProperty.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaProperty.java
index 80c6e3ebd0..80c6e3ebd0 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaProperty.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/SchemaProperty.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/WorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/WorkItem.java
index 90afc70f31..90afc70f31 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/WorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/WorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/WorkQueue.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/WorkQueue.java
index 75b4e5d855..75b4e5d855 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/WorkQueue.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/WorkQueue.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Console.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Console.png
index cb2a5ee800..cb2a5ee800 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Console.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Console.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfData.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfData.png
index 2665803e39..2665803e39 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfData.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfData.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfEventListenerModel.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfEventListenerModel.png
index 26a5f71b56..26a5f71b56 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfEventListenerModel.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfEventListenerModel.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfQuery.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfQuery.png
index 9e471a08c0..9e471a08c0 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfQuery.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/QmfQuery.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Schema.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Schema.png
index b0277f4fc5..b0277f4fc5 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Schema.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Schema.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Subscriptions.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Subscriptions.png
index 977e222129..977e222129 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Subscriptions.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/Subscriptions.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkItem.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkItem.png
index 14c8c56d28..14c8c56d28 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkItem.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkItem.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkQueueEventModel.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkQueueEventModel.png
index fc2a722985..fc2a722985 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkQueueEventModel.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/common/doc-files/WorkQueueEventModel.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/Agent.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/Agent.java
index 26c80df809..26c80df809 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/Agent.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/Agent.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentAccessWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentAccessWorkItem.java
index ff5668fe2e..ff5668fe2e 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentAccessWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentAccessWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentAddedWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentAddedWorkItem.java
index 6f7b1812c6..6f7b1812c6 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentAddedWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentAddedWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentDeletedWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentDeletedWorkItem.java
index 9644d205a7..9644d205a7 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentDeletedWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentDeletedWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentHeartbeatWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentHeartbeatWorkItem.java
index 4406d96567..4406d96567 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentHeartbeatWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentHeartbeatWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentProxy.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentProxy.java
index 55eb0df7b6..55eb0df7b6 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentProxy.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentProxy.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentRestartedWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentRestartedWorkItem.java
index 25bd03654a..25bd03654a 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentRestartedWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/AgentRestartedWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/Console.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/Console.java
index 9a5c2e560d..9a5c2e560d 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/Console.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/Console.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/EventReceivedWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/EventReceivedWorkItem.java
index 311acf3dbb..311acf3dbb 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/EventReceivedWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/EventReceivedWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/MethodResponseWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/MethodResponseWorkItem.java
index 01dde0b6b6..01dde0b6b6 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/MethodResponseWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/MethodResponseWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/MethodResult.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/MethodResult.java
index 8822e02752..8822e02752 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/MethodResult.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/MethodResult.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/ObjectUpdateWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/ObjectUpdateWorkItem.java
index 13a197b121..13a197b121 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/ObjectUpdateWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/ObjectUpdateWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/QmfConsoleData.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/QmfConsoleData.java
index 10d764d3d0..10d764d3d0 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/QmfConsoleData.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/QmfConsoleData.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeIndication.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeIndication.java
index 8277e3c0e1..8277e3c0e1 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeIndication.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeIndication.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeParams.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeParams.java
index 2e15a3153b..2e15a3153b 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeParams.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeParams.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeResponseWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeResponseWorkItem.java
index 968ef0a6a2..968ef0a6a2 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeResponseWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscribeResponseWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscriptionIndicationWorkItem.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscriptionIndicationWorkItem.java
index d9123e9a2c..d9123e9a2c 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscriptionIndicationWorkItem.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscriptionIndicationWorkItem.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscriptionManager.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscriptionManager.java
index 69889d85de..69889d85de 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscriptionManager.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/SubscriptionManager.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/Console.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/Console.png
index cb2a5ee800..cb2a5ee800 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/Console.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/Console.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/QmfEventListenerModel.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/QmfEventListenerModel.png
index 26a5f71b56..26a5f71b56 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/QmfEventListenerModel.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/QmfEventListenerModel.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/Subscriptions.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/Subscriptions.png
index 01772c6d45..01772c6d45 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/Subscriptions.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/Subscriptions.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/WorkQueueEventModel.png b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/WorkQueueEventModel.png
index fc2a722985..fc2a722985 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/WorkQueueEventModel.png
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/console/doc-files/WorkQueueEventModel.png
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/ConnectionHelper.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/ConnectionHelper.java
index b5655dda29..b5655dda29 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/ConnectionHelper.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/ConnectionHelper.java
diff --git a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
index d38fa03b5a..d38fa03b5a 100644
--- a/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
+++ b/qpid/tools/src/java/qpid-qmf2/src/main/java/org/apache/qpid/qmf2/util/GetOpt.java
diff --git a/tools/src/py/.gitignore b/qpid/tools/src/py/.gitignore
index 628d81888c..628d81888c 100644
--- a/tools/src/py/.gitignore
+++ b/qpid/tools/src/py/.gitignore
diff --git a/tools/src/py/README.txt b/qpid/tools/src/py/README.txt
index cabeb1be02..cabeb1be02 100644
--- a/tools/src/py/README.txt
+++ b/qpid/tools/src/py/README.txt
diff --git a/tools/src/py/qlslibs/__init__.py b/qpid/tools/src/py/qlslibs/__init__.py
index d8a500d9d8..d8a500d9d8 100644
--- a/tools/src/py/qlslibs/__init__.py
+++ b/qpid/tools/src/py/qlslibs/__init__.py
diff --git a/tools/src/py/qlslibs/analyze.py b/qpid/tools/src/py/qlslibs/analyze.py
index a67e17e426..a67e17e426 100644
--- a/tools/src/py/qlslibs/analyze.py
+++ b/qpid/tools/src/py/qlslibs/analyze.py
diff --git a/tools/src/py/qlslibs/efp.py b/qpid/tools/src/py/qlslibs/efp.py
index 1c751c3d06..1c751c3d06 100644
--- a/tools/src/py/qlslibs/efp.py
+++ b/qpid/tools/src/py/qlslibs/efp.py
diff --git a/tools/src/py/qlslibs/err.py b/qpid/tools/src/py/qlslibs/err.py
index f47632ce6a..f47632ce6a 100644
--- a/tools/src/py/qlslibs/err.py
+++ b/qpid/tools/src/py/qlslibs/err.py
diff --git a/tools/src/py/qlslibs/jrnl.py b/qpid/tools/src/py/qlslibs/jrnl.py
index ee25015220..ee25015220 100644
--- a/tools/src/py/qlslibs/jrnl.py
+++ b/qpid/tools/src/py/qlslibs/jrnl.py
diff --git a/tools/src/py/qlslibs/utils.py b/qpid/tools/src/py/qlslibs/utils.py
index c32f8c7abb..c32f8c7abb 100644
--- a/tools/src/py/qlslibs/utils.py
+++ b/qpid/tools/src/py/qlslibs/utils.py
diff --git a/tools/src/py/qmf-tool b/qpid/tools/src/py/qmf-tool
index 407ae74b10..407ae74b10 100755
--- a/tools/src/py/qmf-tool
+++ b/qpid/tools/src/py/qmf-tool
diff --git a/tools/src/py/qpid-config b/qpid/tools/src/py/qpid-config
index 130f90a291..130f90a291 100755
--- a/tools/src/py/qpid-config
+++ b/qpid/tools/src/py/qpid-config
diff --git a/tools/src/py/qpid-ha b/qpid/tools/src/py/qpid-ha
index 76d9abde79..76d9abde79 100755
--- a/tools/src/py/qpid-ha
+++ b/qpid/tools/src/py/qpid-ha
diff --git a/tools/src/py/qpid-printevents b/qpid/tools/src/py/qpid-printevents
index 1d123fd345..1d123fd345 100755
--- a/tools/src/py/qpid-printevents
+++ b/qpid/tools/src/py/qpid-printevents
diff --git a/tools/src/py/qpid-qls-analyze b/qpid/tools/src/py/qpid-qls-analyze
index 35b370f4a3..35b370f4a3 100755
--- a/tools/src/py/qpid-qls-analyze
+++ b/qpid/tools/src/py/qpid-qls-analyze
diff --git a/tools/src/py/qpid-queue-stats b/qpid/tools/src/py/qpid-queue-stats
index 9d7d8d9bbf..9d7d8d9bbf 100755
--- a/tools/src/py/qpid-queue-stats
+++ b/qpid/tools/src/py/qpid-queue-stats
diff --git a/tools/src/py/qpid-receive b/qpid/tools/src/py/qpid-receive
index f14df277ac..f14df277ac 100755
--- a/tools/src/py/qpid-receive
+++ b/qpid/tools/src/py/qpid-receive
diff --git a/tools/src/py/qpid-route b/qpid/tools/src/py/qpid-route
index 4796103c0e..4796103c0e 100755
--- a/tools/src/py/qpid-route
+++ b/qpid/tools/src/py/qpid-route
diff --git a/tools/src/py/qpid-send b/qpid/tools/src/py/qpid-send
index b0105e41a6..b0105e41a6 100755
--- a/tools/src/py/qpid-send
+++ b/qpid/tools/src/py/qpid-send
diff --git a/tools/src/py/qpid-stat b/qpid/tools/src/py/qpid-stat
index ecbfddf5fb..ecbfddf5fb 100755
--- a/tools/src/py/qpid-stat
+++ b/qpid/tools/src/py/qpid-stat
diff --git a/tools/src/py/qpid-store-chk b/qpid/tools/src/py/qpid-store-chk
index f6d70cb3c6..f6d70cb3c6 100755
--- a/tools/src/py/qpid-store-chk
+++ b/qpid/tools/src/py/qpid-store-chk
diff --git a/tools/src/py/qpid-store-resize b/qpid/tools/src/py/qpid-store-resize
index 38d8eaf1ad..38d8eaf1ad 100755
--- a/tools/src/py/qpid-store-resize
+++ b/qpid/tools/src/py/qpid-store-resize
diff --git a/tools/src/py/qpid-tool b/qpid/tools/src/py/qpid-tool
index b4c01677c3..b4c01677c3 100755
--- a/tools/src/py/qpid-tool
+++ b/qpid/tools/src/py/qpid-tool
diff --git a/tools/src/py/qpidstore/__init__.py b/qpid/tools/src/py/qpidstore/__init__.py
index d8a500d9d8..d8a500d9d8 100644
--- a/tools/src/py/qpidstore/__init__.py
+++ b/qpid/tools/src/py/qpidstore/__init__.py
diff --git a/tools/src/py/qpidstore/janal.py b/qpid/tools/src/py/qpidstore/janal.py
index 1a892aca60..1a892aca60 100644
--- a/tools/src/py/qpidstore/janal.py
+++ b/qpid/tools/src/py/qpidstore/janal.py
diff --git a/tools/src/py/qpidstore/jerr.py b/qpid/tools/src/py/qpidstore/jerr.py
index 448f881ce3..448f881ce3 100644
--- a/tools/src/py/qpidstore/jerr.py
+++ b/qpid/tools/src/py/qpidstore/jerr.py
diff --git a/tools/src/py/qpidstore/jrnl.py b/qpid/tools/src/py/qpidstore/jrnl.py
index 7c4d6de4a9..7c4d6de4a9 100644
--- a/tools/src/py/qpidstore/jrnl.py
+++ b/qpid/tools/src/py/qpidstore/jrnl.py
diff --git a/tools/src/py/qpidtoollibs/__init__.py b/qpid/tools/src/py/qpidtoollibs/__init__.py
index 2815bac22f..2815bac22f 100644
--- a/tools/src/py/qpidtoollibs/__init__.py
+++ b/qpid/tools/src/py/qpidtoollibs/__init__.py
diff --git a/tools/src/py/qpidtoollibs/broker.py b/qpid/tools/src/py/qpidtoollibs/broker.py
index fca6680067..fca6680067 100644
--- a/tools/src/py/qpidtoollibs/broker.py
+++ b/qpid/tools/src/py/qpidtoollibs/broker.py
diff --git a/tools/src/py/qpidtoollibs/config.py b/qpid/tools/src/py/qpidtoollibs/config.py
index 9168215ac3..9168215ac3 100644
--- a/tools/src/py/qpidtoollibs/config.py
+++ b/qpid/tools/src/py/qpidtoollibs/config.py
diff --git a/tools/src/py/qpidtoollibs/disp.py b/qpid/tools/src/py/qpidtoollibs/disp.py
index 1b7419ba2c..1b7419ba2c 100644
--- a/tools/src/py/qpidtoollibs/disp.py
+++ b/qpid/tools/src/py/qpidtoollibs/disp.py
diff --git a/tools/src/ruby/qpid_management/.gitignore b/qpid/tools/src/ruby/qpid_management/.gitignore
index c89dc10304..c89dc10304 100644
--- a/tools/src/ruby/qpid_management/.gitignore
+++ b/qpid/tools/src/ruby/qpid_management/.gitignore
diff --git a/tools/src/ruby/qpid_management/.rspec b/qpid/tools/src/ruby/qpid_management/.rspec
index 4e1e0d2f72..4e1e0d2f72 100644
--- a/tools/src/ruby/qpid_management/.rspec
+++ b/qpid/tools/src/ruby/qpid_management/.rspec
diff --git a/tools/src/ruby/qpid_management/Gemfile b/qpid/tools/src/ruby/qpid_management/Gemfile
index 1bd80c10c1..1bd80c10c1 100644
--- a/tools/src/ruby/qpid_management/Gemfile
+++ b/qpid/tools/src/ruby/qpid_management/Gemfile
diff --git a/tools/src/ruby/qpid_management/Gemfile.lock b/qpid/tools/src/ruby/qpid_management/Gemfile.lock
index bf35564e90..bf35564e90 100644
--- a/tools/src/ruby/qpid_management/Gemfile.lock
+++ b/qpid/tools/src/ruby/qpid_management/Gemfile.lock
diff --git a/tools/src/ruby/qpid_management/Rakefile b/qpid/tools/src/ruby/qpid_management/Rakefile
index 7f295eda5c..7f295eda5c 100644
--- a/tools/src/ruby/qpid_management/Rakefile
+++ b/qpid/tools/src/ruby/qpid_management/Rakefile
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management.rb
index 0529710693..0529710693 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/acl.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/acl.rb
index 589b11fa59..589b11fa59 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/acl.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/acl.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/binding.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/binding.rb
index cc46d84eeb..cc46d84eeb 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/binding.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/binding.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/bridge.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/bridge.rb
index cece0ba2ed..cece0ba2ed 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/bridge.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/bridge.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/broker.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker.rb
index 31171bdf35..31171bdf35 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/broker.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/broker_agent.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker_agent.rb
index 800dcf26dc..800dcf26dc 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/broker_agent.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker_agent.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/broker_object.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker_object.rb
index fbbe5ff6e2..fbbe5ff6e2 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/broker_object.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/broker_object.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/cluster.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/cluster.rb
index 4fa7f146a7..4fa7f146a7 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/cluster.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/cluster.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/connection.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/connection.rb
index 153ccee684..153ccee684 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/connection.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/connection.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/errors.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/errors.rb
index b922cda680..b922cda680 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/errors.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/errors.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/exchange.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/exchange.rb
index 5a3223aba6..5a3223aba6 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/exchange.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/exchange.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/ha_broker.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/ha_broker.rb
index 1ac9ea7a17..1ac9ea7a17 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/ha_broker.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/ha_broker.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/link.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/link.rb
index 455b26a440..455b26a440 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/link.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/link.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/memory.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/memory.rb
index 39dd803c9a..39dd803c9a 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/memory.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/memory.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/queue.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/queue.rb
index c4fae3a53e..c4fae3a53e 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/queue.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/queue.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/session.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/session.rb
index b4fcc7da59..b4fcc7da59 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/session.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/session.rb
diff --git a/tools/src/ruby/qpid_management/lib/qpid_management/subscription.rb b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/subscription.rb
index fcff2831c0..fcff2831c0 100644
--- a/tools/src/ruby/qpid_management/lib/qpid_management/subscription.rb
+++ b/qpid/tools/src/ruby/qpid_management/lib/qpid_management/subscription.rb
diff --git a/tools/src/ruby/qpid_management/qpid_management.gemspec b/qpid/tools/src/ruby/qpid_management/qpid_management.gemspec
index a6cc1b828e..a6cc1b828e 100644
--- a/tools/src/ruby/qpid_management/qpid_management.gemspec
+++ b/qpid/tools/src/ruby/qpid_management/qpid_management.gemspec
diff --git a/tools/src/ruby/qpid_management/spec/broker_agent_spec.rb b/qpid/tools/src/ruby/qpid_management/spec/broker_agent_spec.rb
index 7ffbf842e2..7ffbf842e2 100644
--- a/tools/src/ruby/qpid_management/spec/broker_agent_spec.rb
+++ b/qpid/tools/src/ruby/qpid_management/spec/broker_agent_spec.rb
diff --git a/tools/src/ruby/qpid_management/spec/broker_spec.rb b/qpid/tools/src/ruby/qpid_management/spec/broker_spec.rb
index 6d6e1106a4..6d6e1106a4 100644
--- a/tools/src/ruby/qpid_management/spec/broker_spec.rb
+++ b/qpid/tools/src/ruby/qpid_management/spec/broker_spec.rb
diff --git a/tools/src/ruby/qpid_management/spec/spec_helper.rb b/qpid/tools/src/ruby/qpid_management/spec/spec_helper.rb
index f552c55888..f552c55888 100644
--- a/tools/src/ruby/qpid_management/spec/spec_helper.rb
+++ b/qpid/tools/src/ruby/qpid_management/spec/spec_helper.rb
diff --git a/wcf/LICENSE.txt b/qpid/wcf/LICENSE.txt
index d645695673..d645695673 100644
--- a/wcf/LICENSE.txt
+++ b/qpid/wcf/LICENSE.txt
diff --git a/wcf/NOTICE.txt b/qpid/wcf/NOTICE.txt
index 41117b0fa0..41117b0fa0 100644
--- a/wcf/NOTICE.txt
+++ b/qpid/wcf/NOTICE.txt
diff --git a/wcf/QpidWcf.sln b/qpid/wcf/QpidWcf.sln
index 9e3cc5621e..9e3cc5621e 100644
--- a/wcf/QpidWcf.sln
+++ b/qpid/wcf/QpidWcf.sln
diff --git a/wcf/ReadMe.txt b/qpid/wcf/ReadMe.txt
index b49e1a37ee..b49e1a37ee 100644
--- a/wcf/ReadMe.txt
+++ b/qpid/wcf/ReadMe.txt
diff --git a/wcf/samples/Channel/AppConfig/ConfigDemo.cs b/qpid/wcf/samples/Channel/AppConfig/ConfigDemo.cs
index 3a7eaef57f..3a7eaef57f 100644
--- a/wcf/samples/Channel/AppConfig/ConfigDemo.cs
+++ b/qpid/wcf/samples/Channel/AppConfig/ConfigDemo.cs
diff --git a/wcf/samples/Channel/AppConfig/ConfigDemo.csproj b/qpid/wcf/samples/Channel/AppConfig/ConfigDemo.csproj
index 41ee6c4f0d..41ee6c4f0d 100644
--- a/wcf/samples/Channel/AppConfig/ConfigDemo.csproj
+++ b/qpid/wcf/samples/Channel/AppConfig/ConfigDemo.csproj
diff --git a/wcf/samples/Channel/HelloWorld/HelloWorld.cs b/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.cs
index 88cb11038d..88cb11038d 100644
--- a/wcf/samples/Channel/HelloWorld/HelloWorld.cs
+++ b/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.cs
diff --git a/wcf/samples/Channel/HelloWorld/HelloWorld.csproj b/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.csproj
index 5d2a8a3e94..5d2a8a3e94 100644
--- a/wcf/samples/Channel/HelloWorld/HelloWorld.csproj
+++ b/qpid/wcf/samples/Channel/HelloWorld/HelloWorld.csproj
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
index 93ac97bc66..93ac97bc66 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
index a609ec9828..a609ec9828 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Client.csproj
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
index 414a3b5858..414a3b5858 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Client/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
index 2b75210ce3..2b75210ce3 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
index 0342097ed9..0342097ed9 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.cs
diff --git a/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
index 09c7265a87..09c7265a87 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/Service/Service.csproj
diff --git a/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln b/qpid/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
index 6f30a5e053..6f30a5e053 100644
--- a/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
+++ b/qpid/wcf/samples/Channel/WCFToWCFDirect/WCFToWCFDirect.sln
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
index c1e3ebbc88..c1e3ebbc88 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
index 7031740601..7031740601 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Another_Topic_Consumer.csproj
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
index 8c22cb6d1f..8c22cb6d1f 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Another_Topic_Consumer/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
index 19fea85618..19fea85618 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
index c4dd1e2256..c4dd1e2256 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
index 1d4ffd96bb..1d4ffd96bb 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Consumer/Topic_Consumer.csproj
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
index 87310bf92a..87310bf92a 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Properties/AssemblyInfo.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
index e3850eb4c0..e3850eb4c0 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.cs
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
index cd7f79c581..cd7f79c581 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/Topic_Producer/Topic_Producer.csproj
diff --git a/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln b/qpid/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
index d8a56ea8db..d8a56ea8db 100644
--- a/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
+++ b/qpid/wcf/samples/Channel/WCFToWCFPubSub/WCFToWCFPubSub.sln
diff --git a/wcf/samples/Integration/Drain/Drain.cs b/qpid/wcf/samples/Integration/Drain/Drain.cs
index 7a88494458..7a88494458 100644
--- a/wcf/samples/Integration/Drain/Drain.cs
+++ b/qpid/wcf/samples/Integration/Drain/Drain.cs
diff --git a/wcf/samples/Integration/Drain/Drain.csproj b/qpid/wcf/samples/Integration/Drain/Drain.csproj
index 06c32f5064..06c32f5064 100644
--- a/wcf/samples/Integration/Drain/Drain.csproj
+++ b/qpid/wcf/samples/Integration/Drain/Drain.csproj
diff --git a/wcf/samples/Integration/Integration.sln b/qpid/wcf/samples/Integration/Integration.sln
index 59b228e92a..59b228e92a 100644
--- a/wcf/samples/Integration/Integration.sln
+++ b/qpid/wcf/samples/Integration/Integration.sln
diff --git a/wcf/samples/Integration/Spout/Spout.cs b/qpid/wcf/samples/Integration/Spout/Spout.cs
index 651566fbd6..651566fbd6 100644
--- a/wcf/samples/Integration/Spout/Spout.cs
+++ b/qpid/wcf/samples/Integration/Spout/Spout.cs
diff --git a/wcf/samples/Integration/Spout/Spout.csproj b/qpid/wcf/samples/Integration/Spout/Spout.csproj
index b104000ad2..b104000ad2 100644
--- a/wcf/samples/Integration/Spout/Spout.csproj
+++ b/qpid/wcf/samples/Integration/Spout/Spout.csproj
diff --git a/wcf/samples/Integration/Util/Options.cs b/qpid/wcf/samples/Integration/Util/Options.cs
index a929f8f2de..a929f8f2de 100644
--- a/wcf/samples/Integration/Util/Options.cs
+++ b/qpid/wcf/samples/Integration/Util/Options.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
index 980ae78361..980ae78361 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpBoolean.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
index c114e98a71..c114e98a71 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpInt.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
index 4099571fe0..4099571fe0 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpProperties.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
index 87cebe878c..87cebe878c 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpString.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
index 8cd3ac9e4a..8cd3ac9e4a 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpType.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
index 2a544cf6d0..2a544cf6d0 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpTypes.csproj
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
index 5ec8a732cf..5ec8a732cf 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/AmqpUbyte.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat b/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
index d67e2119f9..d67e2119f9 100755
--- a/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/CreateNetModule.bat
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
index dffaee0d0d..dffaee0d0d 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/Properties/AssemblyInfo.cs
diff --git a/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs b/qpid/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
index b80f8b9e9e..b80f8b9e9e 100644
--- a/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
+++ b/qpid/wcf/src/Apache/Qpid/AmqpTypes/PropertyName.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
index d533fc212e..d533fc212e 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBinding.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
index de263bc4ef..de263bc4ef 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingCollectionElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
index a537a6c6c3..a537a6c6c3 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinaryBindingConfigurationElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
index be54f06b2f..be54f06b2f 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBinding.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
index e8d3b6fad4..e8d3b6fad4 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingCollectionElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
index edc91e67c1..edc91e67c1 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpBindingConfigurationElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
index 9b27b00994..9b27b00994 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelFactory.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
index b431689c4d..b431689c4d 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelHelpers.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
index 78655f2124..78655f2124 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpChannelListener.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs
index e2da07c800..e2da07c800 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpCredential.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs
index 2bafbbb54e..2bafbbb54e 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpCredentialType.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs
index 5d88afb88f..5d88afb88f 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurity.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs
index f7370e40f5..f7370e40f5 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs
index 88e7add054..88e7add054 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpSecurityMode.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
index a98f361d19..a98f361d19 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportBindingElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
index 6f0ffd9815..6f0ffd9815 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportChannel.cs
diff --git a/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs
index b722983ead..b722983ead 100644
--- a/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/AmqpTransportSecurity.cs
diff --git a/wcf/src/Apache/Qpid/Channel/Channel.csproj b/qpid/wcf/src/Apache/Qpid/Channel/Channel.csproj
index 1eb811b425..1eb811b425 100644
--- a/wcf/src/Apache/Qpid/Channel/Channel.csproj
+++ b/qpid/wcf/src/Apache/Qpid/Channel/Channel.csproj
diff --git a/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs b/qpid/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
index 7238ff2120..7238ff2120 100644
--- a/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/ConnectionManager.cs
diff --git a/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs b/qpid/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
index edd9a056a7..edd9a056a7 100644
--- a/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/Properties/AssemblyInfo.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessage.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessage.cs
index 5925fa47dc..5925fa47dc 100644
--- a/wcf/src/Apache/Qpid/Channel/RawMessage.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawMessage.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
index 76dae6f6c7..76dae6f6c7 100644
--- a/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoder.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
index 5c015f9a1b..5c015f9a1b 100644
--- a/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncoderFactory.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
index 5ec10a976d..5ec10a976d 100644
--- a/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawMessageEncodingBindingElement.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
index 8fadfce441..8fadfce441 100644
--- a/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawXmlReader.cs
diff --git a/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs b/qpid/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
index 7d05b70807..7d05b70807 100644
--- a/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
+++ b/qpid/wcf/src/Apache/Qpid/Channel/RawXmlWriter.cs
diff --git a/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp b/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
index ec98289923..ec98289923 100644
--- a/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
+++ b/qpid/wcf/src/Apache/Qpid/DtcPlugin/DtcPlugin.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
index 1bc9a15d92..1bc9a15d92 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpConnection.h b/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.h
index ef4d0e3f37..ef4d0e3f37 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpConnection.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpConnection.h
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
index 5c333aff60..5c333aff60 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpMessage.h b/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.h
index f0801d30dc..f0801d30dc 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpMessage.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpMessage.h
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
index ac7c777d1f..ac7c777d1f 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/AmqpSession.h b/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.h
index 7a49496805..7a49496805 100644
--- a/wcf/src/Apache/Qpid/Interop/AmqpSession.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AmqpSession.h
diff --git a/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp b/qpid/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
index 91c23ae30a..91c23ae30a 100644
--- a/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/AssemblyInfo.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp b/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
index e39ee1b1ae..e39ee1b1ae 100644
--- a/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h b/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
index 88880c3721..88880c3721 100644
--- a/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/CompletionWaiter.h
diff --git a/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp b/qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp
index 6ea31f8401..6ea31f8401 100644
--- a/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h b/qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h
index 7df491eec2..7df491eec2 100644
--- a/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/DtxResourceManager.h
diff --git a/wcf/src/Apache/Qpid/Interop/InputLink.cpp b/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp
index f8189df0dd..f8189df0dd 100644
--- a/wcf/src/Apache/Qpid/Interop/InputLink.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/InputLink.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/InputLink.h b/qpid/wcf/src/Apache/Qpid/Interop/InputLink.h
index 136d53d280..136d53d280 100644
--- a/wcf/src/Apache/Qpid/Interop/InputLink.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/InputLink.h
diff --git a/wcf/src/Apache/Qpid/Interop/Interop.vcproj b/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
index fe288cbe76..fe288cbe76 100644
--- a/wcf/src/Apache/Qpid/Interop/Interop.vcproj
+++ b/qpid/wcf/src/Apache/Qpid/Interop/Interop.vcproj
diff --git a/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp b/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
index f2cb5740d3..f2cb5740d3 100644
--- a/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h b/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
index fa8e3f6bde..fa8e3f6bde 100644
--- a/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/MessageBodyStream.h
diff --git a/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp b/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
index f7a28b0692..f7a28b0692 100644
--- a/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/MessageWaiter.h b/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.h
index 3737430844..3737430844 100644
--- a/wcf/src/Apache/Qpid/Interop/MessageWaiter.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/MessageWaiter.h
diff --git a/wcf/src/Apache/Qpid/Interop/OutputLink.cpp b/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.cpp
index de7141dadb..de7141dadb 100644
--- a/wcf/src/Apache/Qpid/Interop/OutputLink.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/OutputLink.h b/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.h
index e30d1cc79f..e30d1cc79f 100644
--- a/wcf/src/Apache/Qpid/Interop/OutputLink.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/OutputLink.h
diff --git a/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp b/qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp
index bfae1ab313..bfae1ab313 100644
--- a/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/QpidAddress.h b/qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.h
index d24317c2aa..d24317c2aa 100644
--- a/wcf/src/Apache/Qpid/Interop/QpidAddress.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/QpidAddress.h
diff --git a/wcf/src/Apache/Qpid/Interop/QpidException.h b/qpid/wcf/src/Apache/Qpid/Interop/QpidException.h
index 91677a5e73..91677a5e73 100644
--- a/wcf/src/Apache/Qpid/Interop/QpidException.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/QpidException.h
diff --git a/wcf/src/Apache/Qpid/Interop/QpidMarshal.h b/qpid/wcf/src/Apache/Qpid/Interop/QpidMarshal.h
index 3e22af7b39..3e22af7b39 100644
--- a/wcf/src/Apache/Qpid/Interop/QpidMarshal.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/QpidMarshal.h
diff --git a/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp b/qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp
index 23743316ff..23743316ff 100644
--- a/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp
+++ b/qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.cpp
diff --git a/wcf/src/Apache/Qpid/Interop/XaTransaction.h b/qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.h
index 8ff9f99893..8ff9f99893 100644
--- a/wcf/src/Apache/Qpid/Interop/XaTransaction.h
+++ b/qpid/wcf/src/Apache/Qpid/Interop/XaTransaction.h
diff --git a/wcf/src/wcfnet.snk b/qpid/wcf/src/wcfnet.snk
index d6456c8cf3..d6456c8cf3 100644
--- a/wcf/src/wcfnet.snk
+++ b/qpid/wcf/src/wcfnet.snk
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
index 23bed6c603..23bed6c603 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/AsyncTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs
index fa3b79d3a7..fa3b79d3a7 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/BasicTransactionTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs
index 9c9a6c095e..9c9a6c095e 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelAbortCommitTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs
index 35e32ce25a..35e32ce25a 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelContextParameters.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs
index 9cabae3201..9cabae3201 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelEntity.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs
index 20af98fa64..20af98fa64 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelReceiver.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs
index 78950dc0d5..78950dc0d5 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/ChannelSender.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
index 45a926ce4d..45a926ce4d 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/CustomAmqpBindingTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
index ab36222d6a..ab36222d6a 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/FunctionalTests.csproj
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
index a1ffac50b3..a1ffac50b3 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IGenericObjectService.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
index 25f7010a89..25f7010a89 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IInteropService.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
index 8abbe04874..8abbe04874 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService1.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
index 7d056e9c82..7d056e9c82 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService2.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
index 3ff2085557..3ff2085557 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedDatagramService3.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs
index 49c42a25b6..49c42a25b6 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTSRAttribute.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs
index eabceb5720..eabceb5720 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/IQueuedServiceUsingTransactionScope.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
index a9555d190d..a9555d190d 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageBodyTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
index b623a0196b..b623a0196b 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageClient.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
index bd6459ccb9..bd6459ccb9 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageProperties.txt
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
index 8e192e90f1..8e192e90f1 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessagePropertiesTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
index 581464d25e..581464d25e 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MessageService.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
index d09832757a..d09832757a 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/MultipleEndpointsSameQueueTest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
index b47a25494f..b47a25494f 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Properties/AssemblyInfo.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
index a5eed8839b..a5eed8839b 100755
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/RunTests.bat
diff --git a/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
index f08a6fbbfc..f08a6fbbfc 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/Functional/Util.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs
index 55a01c790c..55a01c790c 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/RawBodyUtility.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs
index c97d3da27c..c97d3da27c 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.cs
diff --git a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj
index 44ef998a24..44ef998a24 100644
--- a/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj
+++ b/qpid/wcf/test/Apache/Qpid/Test/Channel/WcfPerftest/WcfPerftest.csproj
diff --git a/wcf/tools/QCreate/QCreate.cpp b/qpid/wcf/tools/QCreate/QCreate.cpp
index 7b0231f339..7b0231f339 100644
--- a/wcf/tools/QCreate/QCreate.cpp
+++ b/qpid/wcf/tools/QCreate/QCreate.cpp
diff --git a/wcf/tools/QCreate/QCreate.sln b/qpid/wcf/tools/QCreate/QCreate.sln
index c01675d53a..c01675d53a 100644
--- a/wcf/tools/QCreate/QCreate.sln
+++ b/qpid/wcf/tools/QCreate/QCreate.sln
diff --git a/wcf/tools/QCreate/QCreate.vcproj b/qpid/wcf/tools/QCreate/QCreate.vcproj
index ba77952966..ba77952966 100644
--- a/wcf/tools/QCreate/QCreate.vcproj
+++ b/qpid/wcf/tools/QCreate/QCreate.vcproj
diff --git a/wcf/tools/QCreate/ReadMe.txt b/qpid/wcf/tools/QCreate/ReadMe.txt
index b3efb84503..b3efb84503 100644
--- a/wcf/tools/QCreate/ReadMe.txt
+++ b/qpid/wcf/tools/QCreate/ReadMe.txt
diff --git a/wcf/tools/QCreate/stdafx.cpp b/qpid/wcf/tools/QCreate/stdafx.cpp
index 568cd3b7d6..568cd3b7d6 100644
--- a/wcf/tools/QCreate/stdafx.cpp
+++ b/qpid/wcf/tools/QCreate/stdafx.cpp
diff --git a/wcf/tools/QCreate/stdafx.h b/qpid/wcf/tools/QCreate/stdafx.h
index a516e19a10..a516e19a10 100644
--- a/wcf/tools/QCreate/stdafx.h
+++ b/qpid/wcf/tools/QCreate/stdafx.h
diff --git a/wcf/tools/QCreate/targetver.h b/qpid/wcf/tools/QCreate/targetver.h
index 9cfb78641b..9cfb78641b 100644
--- a/wcf/tools/QCreate/targetver.h
+++ b/qpid/wcf/tools/QCreate/targetver.h