WFLY-1727: resource injection support for external contexts
WFLY-2655 Show warning for JDBC drivers as modules with no driver
[WFLY-2926] Add com.google.guava module dependency to JBeret
Upgrade JBeret to 1.0.1.CR1
WFLY-2965 IllegalArgumentException: JBAS014577: Unsupported marshalling version: 1 on shutdown
WFLY-2977: fixes NPE when invoking SessionContext#isCallerInRole() with an anonymous caller
[WFLY-3106] Allow Infinispan cache to set statistics-enabled independently of cache manager.
Merge pull request #6031 from rachmatowicz/WFLY-3106

[WFLY-3106] Allow Infinispan cache to set statistics-enabled independently of cache manager.
Merge pull request #5205 from emmartins/WFLY-1727

WFLY-1727: resource injection support for external contexts
WFLY-3116 BZ1074493: Upgrade to HAL 2.2.0.Beta5
[WFLY-3112] One can't change history and decay with DynamicLoadBalanceFactorProvider
Merge pull request #6035 from hpehl/WFLY-3116

WFLY-3116 BZ1074493: Upgrade to HAL 2.2.0.Beta5
[WFLY-3108] BZ1076066 Use domain.cached-remote.xml when promoting a backup slave HC to master

Conflicts:
	host-controller/src/main/java/org/jboss/as/host/controller/HostControllerEnvironment.java
Merge pull request #6036 from rhusar/WFLY-3112/history_decay_not_set

[WFLY-3112] One can't change history and decay with DynamicLoadBalanceFa...
Merge pull request #6039 from bstansberry/WFLY-3108

[WFLY-3108] BZ1076066 Use domain.cached-remote.xml when promoting a back...