Merge pull request #489 from nielspetersen/2.0-stable

Fixes for legacy upgrader in 2.0 stable