Merge in 2.1.3 branch

Changes  -
Included the new rabbit-stamp plugin for use in HA RabbitMQ clusters.