Merge pull request #1222 from clebertsuconic/master

Multiple fixes (TCK, cherry-pick from 2.3 and a tweak on a script to replace hornetq)