Merge pull request #809 from clebertsuconic/Branch_2_2_AS7

HORNETQ-1117 - prevention of races during XA protocol
stomp changes by bhupesh's team