[galaxy-dev] Local galaxy installs - merging upstream changes