Fix exception merging to be compatible with Java 1.6.
Don't access resources during shutdown.

The XaDataSourceManager was creating new resources in
unregisterDataSource(). When this method is called during shutdown,
other components may already have been shut down so the resource
creation may fail.

The particular case we saw was a race condition shutting down during a
master switch, which caused a NullPointerException in
XaConnectionHelperImpl when LuceneDataSource tried to create a
LuceneXaResource with a null XaResourceManager (which had been nulled
out during the master switch).
Remove a catch block that was suppressing failures in a test and make the test more robust.

The catch block in HTTPLoggingDocIT was suppressing all failures. Once
it had been removed it became apparent that the test was
flaky. Specifically it almost always failed in my IDE when run
alone (although it passed when run with the other tests in the file). I
believe the flakiness was because the log file wasn't always flushed to
disk before the assertion was reached.
Isolate HTTPLoggingDocIT from other tests that use the shared server.

o Server tests that create their own server need to extend
  ExclusiveServerTestBase in order to ensure that the shared server is
  not running while they execute.
o HTTPLoggingDocIT runs its own server because it needs specific
  configuration.
Server can dictate which logging kernel uses

And will, in the server setup, have server and kernel use the same logging mechanisms.
This commit also removes usages of java.util.logging from server in favor
of the console logger in kernel.
Merge pull request #2159 from benbc/1.9-dont-access-resources-during-shutdown

Don't access resources during shutdown.
Don't swallow output in problematic test.

TestRecovery is failing on OSX under TeamCity. We need to avoid throwing
away the output from the subprocess so that we can diagnose the problem.
Specify Java subprocess is headless. Needed on OSX with Java 1.6 only.
Merge pull request #2125 from tinwelint/1.9-server-logging

Server can dictate which logging kernel uses
Revert "Specify Java subprocess is headless. Needed on OSX with Java 1.6 only."

Found a better way to do this. If we use MAVEN_OPTS to set the headless
property then it is inherited by subprocesses.

This reverts commit a462796552f1dba45ca4671b42009ee9244c7d0a.
Add some comments to clarify some important subtleties for the synchronization of TxManager.
Merge pull request #2165 from chrisvest/1.9-forcemode-importance

Add some comments to clarify some important subtleties for the synchronization of TxManager.
Added support for fallback to full backup when incremental fails
 o OnlineBackup support for new default backup behavior.
 o Backup tool now handles old backups which cannot do incremental anymore.
Merge pull request #2182 from jakewins/1.9-backup-usability

Added support for fallback to full backup when incremental fails
Fix memory leak in XaResourceManager.

The txOrderMap was initially only meant for and used by recovery. However, HA started
injecting transactions using the same recovery code as well. This meant that the
txOrderMap was steadily accumulating data, but never got cleared, because the clearing
only happened at the end of recovery.

This memory leak has been fixed by removing the txOrderMap completely, and instead let
the TransactionStatus objects know how to order themselves.
Merge pull request #2201 from chrisvest/1.9-fix-txordermap-memory-leak

Fix memory leak in XaResourceManager.
Pulls out "tm ok" state into KernelHealth

which is also now shared with XaLogicalLog so that the same rules about
panicing and respecting a kernel panic event also is in place when
applying external transactions.
Merge pull request #2175 from tinwelint/1.9-apply-tx-kernel-panic

Pulls out "tm ok" state into KernelHealth
System.currentTimeMillis resolution is so bad that sometimes two consecutive calls will return the same value, which caused sporadic failure in TestLockManagerBean
Merge 1.9-maint (f26fcad) into 2.0-maint