1039619 - update output to account for qpidd.conf location changing in qpid 0.24
Merge branch 'jortel-1039619' into pulp-2.3