[galaxy-dev] [hg] galaxy 3025: Fixes, cleanup and new functional tests for da...