There was a recent patch exposing qpid port (and ssl port) for both types of compute node, so please rebased to account for that parameter in both types