Merge pull request #1043 from clebertsuconic/2.3.x

code format only
Fixing Deadlock found by QE as described on  https://bugzilla.redhat.com/show_bug.cgi?id=959616 and upgrade byteman to latest release