Reverting / Fixing a TCK issue and HORNETQ-1305