improve standalone bootstrap configuration
Merge pull request #1910 from andytaylor/new_conf

configuration  improvements
HORNETQ-1429 Fixing AMQP on Security

https://issues.jboss.org/browse/HORNETQ-1429

There's something weird on AMQP qpid clients,
where you could tell the server to not use SASL based on the protocol's signature.
Unfortunately there is no support for the SASL byte on Proton so we had to
implement it manually on hornetq-proton-plug.
Merge pull request #1911 from clebertsuconic/master

HORNETQ-1429 Fixing AMQP on Security
BZ-1152410 - handle rollback called twice

https://bugzilla.redhat.com/show_bug.cgi?id=1152410

There are 2 parts to this, firstly make sure that if the call to rollback fails make sure that the session and consumers re restarted.

secondly at the server make sure that we dont cancel the refs and add them to the already rolled back tx, we should handle them separately and rollback on to the queue in a new tx.