fix upgrade finish detection
Merge branch 'jacalvo/migration-from-3.4'