Split install and upgrade into 2 functions
Merge branch '1.6-install-upgrade-rewrite'