Merge pull request #1692 from andytaylor/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=1115300
Transfer queue tool