QPID-4760: Associate Java Broker QueueAdapter and SessionAdapter via ConsumerAdapter

merges only the changes to the Java broker from r1476219


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477558 13f79535-47bb-0310-9956-ffa450edef68
QPID-4782: use iterator.remove() to update the map and avoid the CME exposed in r1476219

merged from trunk r1476583


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477567 13f79535-47bb-0310-9956-ffa450edef68
QPID-4784: stop generating errors during creation of PDAM's due to duplicate sasl provider registration, simplify PDAM.

merged from trunk r1477078


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477573 13f79535-47bb-0310-9956-ffa450edef68
QPID-4639: Improve functionality to delete store on virtual host deletion

merged from trunk r1477110


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477576 13f79535-47bb-0310-9956-ffa450edef68
QPID-4753: set vhost SecurityManager _managementMode boolean to equal the parent/broker SecurityManager, validate the ACL file during onCreate to ensure it is usable before allowing it to be added

merged from trunk r1477155


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477577 13f79535-47bb-0310-9956-ffa450edef68
NO-JIRA: [Java Perf Tests] Make perf test config use default virtual host rather than hardcoding 'test'

merged from trunk r1477163


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477578 13f79535-47bb-0310-9956-ffa450edef68
NO-JIRA: Prevent non-ascii warning when compiling amqp-1-0-client-jms module (use unicode escape for pound symbol)

trunk r1477178


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477581 13f79535-47bb-0310-9956-ffa450edef68
QPID-4785: relax restrictions on editing/deleting active ports outwith management-mode

merged from trunk r1477190


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477582 13f79535-47bb-0310-9956-ffa450edef68
QPID-4688: Update Java Broker docbook to reflect change in bdb version

merged from trunk r1477554


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477583 13f79535-47bb-0310-9956-ffa450edef68
Revert "QPID-4687: Add uninstall make target to cmake build"

This reverts the uninstall target added in r1463540, it was not accepted for 0.22 release.
It leaves in place fixes to the python intall tartget that were in the same commit.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477640 13f79535-47bb-0310-9956-ffa450edef68
QPID-4778: Introduce additional states for configured objects: ERRORED and REPLICA

merged from trunk r1477667



git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477682 13f79535-47bb-0310-9956-ffa450edef68
QPID-4791: Change JSESSIONID cookie name to include the port number in order to avoid JSESSIONID cookie name collisions when running multiple we

merged from trunk r1477668



git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477683 13f79535-47bb-0310-9956-ffa450edef68
QPID-4714 Moved _delegate.closeConnection method inside a finally block
to ensure the TCP connection is closed in case an exception is thrown
from any of the methods above.

(cherry picked from commit 874b973366824fba1ae502b10c9a5b66c11e4779)

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477705 13f79535-47bb-0310-9956-ffa450edef68
QPID-4698: Fixed the install location for files under CMake.

Installs the SASL2 qpidd.conf file to /etc/qpid/sasl2/qpidd.conf
Installs qpidd-primary to /etc/rc.d/init.d/qpidd-primary
Installs the qmf-gen Python script to /usr/bin
Installs the managementgen sitepackage to where sitelibs belong

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477766 13f79535-47bb-0310-9956-ffa450edef68
QPID-4698: Missed two macros in qpidd-primary.in

Fixed them to properly set the paths.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477767 13f79535-47bb-0310-9956-ffa450edef68
QPID-4698: Removed the requirement for Python 2.7.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477768 13f79535-47bb-0310-9956-ffa450edef68
QPID-4698: Fixed the location of the SASL2 configuration file.

It was mistakenly installed to /etc/qpid/sasl2 rather than /etc/sasl2.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477778 13f79535-47bb-0310-9956-ffa450edef68
QPID-4795: update naming of the UserManagement MBeans to remove restriction preventing there being multiple AuthenticationProviders capable of user management

merged from trunk r1477965


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1477974 13f79535-47bb-0310-9956-ffa450edef68
QPID-4793: Change test so that regex.h works on other unixes

Change brought in from trunk r1477822

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1478421 13f79535-47bb-0310-9956-ffa450edef68
QPID-4799: Move qpid.pm to the lib directory.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1478456 13f79535-47bb-0310-9956-ffa450edef68