Move configuration to config.0916. Fix minor issues in upgrade.sh
Merge pull request #9 from onikitenko/master

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