Merge VCS integration changes from branch-32 and timezone settings update

Includes the following:

- Changes related to issue #1995 merged from branch-32.
- Two commits related to TBGSettings::SETTING_SERVER_TIMEZONE.

The TBGSettings::SETTING_SERVER_TIMEZONE commits add the following:
- If the setting is not present in the database, use the server default timezone (as configured in PHP configuration file)
- During the upgrade set the setting to default value configured in the PHP configuration file.

I'm not sure if those two SETTING_SERVER_TIMEZONE-related commits are good enough/the right thing to do, so let me know if I should split the pull up (the VCS Integration seems to work ok, though).