https://issues.apache.org/jira/browse/AMQ-5473

Apply patch that allows for durable subs to migrate when links are
stolen.
https://issues.apache.org/jira/browse/AMQ-5479

Fix script output not reading JAVA_HOME
Restore test disabled by mistake
Remove fragments of the setup option
improve configuration file loading

Load only the first available configuration file to prevent confusion in
overloading of configuration parameters
remove hostname from pidfile, minor fixes

This creates problems if the hostname changes (i.e. if you use puppet)
change to the correct variable
ensure that /bin/sh is always used
quote assigned values to prevent problems with empty filenames
improve quoting, improve pidfile handling

quote assigned values to prevent problems with empty filenames
use a more reliable pidfile path
Merge remote-tracking branch 'upstream/trunk' into trunk