[galaxy-dev] [hg] galaxy 1733: Fixes to get functional tests working.