https://bugzilla.redhat.com/show_bug.cgi?id=1023325 - grouping handler now waits for bindings to be created if local
https://bugzilla.redhat.com/show_bug.cgi?id=1023325 - grouping handler can now timeout groupings

Conflicts:
	hornetq-core-client/src/main/java/org/hornetq/api/config/HornetQDefaultConfiguration.java