Update the shuttle client to use the new methods
Update the shuttle client to use the new methods

- sync fixes wih shuttle release
- wait for merge in shuttle to update GLOCKFILE

joeshaw/galaxy,zombor/galaxy,jwilder/galaxy,litl/galaxy