QPID-4677: fix for r1463064, which was apparently too complex for the Eclipse refactor command to do fully the first time or me to notice it didnt ;)

merged from trunk r1463073


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1463188 13f79535-47bb-0310-9956-ffa450edef68