Move configuration to config.0916. Fix minor issues in upgrade.sh