update with recent Galaxy from upstream

Yakubov, Sergeyrequested to merge
merge-upstream into dev

Merge request reports