gerrit 2.0-rc0
Merge 'master' into gerrit2

The Gerrit 1.0 code is being abandoned in favor of Gerrit 2.
This merge commit cuts off the Gerrit 1.0 development history.