Small fix for a merge conflict
Small fix for a merge conflict

There was a merge conflict between long-click-to-drag and service-menu, which was not caught during the merge process itself - argument order had changed on a few methods.

bac/juju-gui,jrwren/juju-gui,bac/juju-gui,mitechie/juju-gui,mitechie/juju-gui,jrwren/juju-gui,bac/juju-gui,CanonicalJS/juju-gui,jrwren/juju-gui,CanonicalJS/juju-gui,mitechie/juju-gui,mitechie/juju-gui,bac/juju-gui,jrwren/juju-gui,CanonicalJS/juju-gui