4.5alpha2 upgrade fixes
Merge pull request #3563 from monishdeb/upgrade-fix

4.5alpha2 upgrade fixes