Support better HttpMessageConverters manipulation

Add additional constructor and a protected postProcessConverters method
to make it easier to manipulate the final converter list that will
be used.

Fixes gh-1482
Merge branch '1.1.x'
Fix Windows Atomikos/Bitronix ApplicationTests

Update SampleAtomikosApplicationTests and SampleBitronixApplicationTests
to not depend on any specific System.out order.

Fixes gh-1472
Workaround fix for git-commit-plugin

This commit is a workaround until git-commit-id-plugin 2.1.11 is
released. See also issue 124 of that project

Fixes gh-1484
Merge branch '1.1.x'
Clarify addResources parameter description

This commit clarifies the role of the 'addResources' flag and makes
it explicit that any duplicate found in the target directory are
actually removed

Fixes gh-1479
Merge branch '1.1.x'
Drop min/max DataSourcePool metrics
Support mixed XA/non-XA ConnectionFactory beans

Update ActiveMQ and HornetQ XA configurations to also expose non-xa
ConnectionFactory variants.

Fixes gh-1461
Clarify the use of spring.profiles

Fixes gh-1470
Merge branch '1.1.x'
Minor asciidoctor formatting
Add group discriminant in case of conflict

Prior to this commit, the repackage goal silently ignored the case of
two libraries having the same name and version but a different group.
As a result, the second library was overwriting the first one in the
repackaged jar.

This commit adds support for custom Library names and updates the
Maven and Gradle plugins so that the name includes the group ID
when there would otherwise be a duplicate.

Fixes gh-1475
Ensure non-remapped calls are still logged

Update LevelRemappingAppender to that any calls that aren't remapped
are still logged.

Fixes gh-1481
Merge branch '1.1.x'
Add HtppClientOptions to TestRestTemplate

Allow customization of the Apache HTTP Client used in TestRestTemplate
via an options enum.

Fixes gh-1497
Merge branch '1.1.x'
Fix @ActiveProfile to override existing profiles

Change SpringApplicationContextLoader to set active profiles using the
`spring.profiles.active` environment property rather than calling
`SpringApplication.setAdditionalProfiles`. This allows @ActiveProfiles
to replace existing profiles rather than add to them which is consistent
with the Spring TestContext Framework.

Fixes gh-1469
Merge branch '1.1.x'
Support for composed "any" condition

Add `AnyNestedCondition` which can be used to create a logical 'or' of
other conditions contained on nested classes. For example:

	static class OnJndiOrProperty extends AnyNestedCondition {

		@ConditionalOnJndi()
		static class OnJndi {
		}

		@ConditionalOnProperty("something")
		static class OnProperty {
		}

	}

Fixes gh-1490