Handle SnF queues on nodes that don't receive the scale-down
fix quorum voting when node number = 2
Merge pull request #1683 from andytaylor/master

test fix and fix quorum voting when node number = 2
Merge pull request #1682 from jbertram/master-snf-refactor

Handle SnF queues on nodes that don't receive the scale-down
-Fix vertx test failures
-update vertx version to 2.1.1
Merge pull request #1685 from gaohoward/master_vertx_testfix

Fix vertx test failures and update vertx version to 2.1.1
fix notification test and assure that CLUSTER_CONNECTION_START is always sent first
added check for null
fix isSharedStore method on HAPolicy to work when colocated
fixed colocated failover example
fixed colocated failover recovery example
added scale down example
Merge pull request #1687 from andytaylor/master-fix

couple of test fixes
Merge pull request #1688 from andytaylor/master-fix

scale down fix and example fixes and additions
https://bugzilla.redhat.com/show_bug.cgi?id=1114973 - fixing org.hornetq.api.core.management.ObjectNameBuilder to return correct Object names...
Merge pull request #1690 from gaohoward/master_bug1114973

https://bugzilla.redhat.com/show_bug.cgi?id=1114973
https://bugzilla.redhat.com/show_bug.cgi?id=1115300 https://issues.jboss.org/browse/HORNETQ-1365 use waitforonmessage when the MDB is being interrupted
Merge pull request #1691 from andytaylor/master

https://bugzilla.redhat.com/show_bug.cgi?id=1115300
refactor standalone distribution assembly
Merge branch 'master' into config-prototype

Conflicts:
	distribution/hornetq/pom.xml
	distribution/hornetq/src/main/assembly/dep.xml