Merge pull request #1531 from clebertsuconic/2.2.eap5

fixing race on test and getting ready for retags
adding investigation tool in case for failover issues, undocumented intentionally