patches from pbrady
el7 qpid fix