QPID-7382: [Java Broker, WMC] Add Content-Disposition to Message download merged from trunk with commands: svn merge -c 1758980 ^/qpid/java/trunk svn merge -c 1760546 ^/qpid/java/trunk some merge conflicts which were resolved manually