* master:
Fix reading the $site_path/etc/ssh_host_key in serialized form
Never compress a pid file under $site_path/logs
Clean up the DWIMery for database.* configuration settings
Completely remove GerritServer.properties
Fix duplicate branches showing in the Branches tab
Refactor GitRepositoryManager to be an interface
Conflicts:
tools/gwtui_dbg.launch
tools/gwtui_mac.launch
Change-Id: If50811015fa24804013338fa4261fc347c2a8812
725fed4269