Merge branch 'stable-2.10'

* stable-2.10:
  Update 2.10 release notes with information from 2.9.2
  Fix NullPointerException in Reindex
  Add CSS style name on review comment div
  Fix incorrect formatting in json documentation
  Don't use deprecated PGPPublicKeyRingCollection constructor
  Add InitStep to fix wrong primary key column order

This reverts commit 12b44cb390
(Add InitStep to fix wrong primary key column order) which is not
needed on master.

This reworks commit db88d15399
(Fix NullPointerException in Reindex) due to injection setup for
the reindex being changed between stable-2.10 and master.

Conflicts:
	gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java

Change-Id: I2061bd2265a7117f1a978c68ac692fe2f09b1884

gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Message.ui.xml

@@ -104,6 +104,8 @@ limitations under the License.
     .closed .reply {
       visibility: HIDDEN;
     }
+    .comment {
+    }
   </ui:style>
 
   <g:HTMLPanel
@@ -124,7 +126,8 @@ limitations under the License.
       </g:HTMLPanel>
       <div ui:field='message'
            aria-hidden='true'
-           style='display: NONE'/>
+           style='display: NONE'
+           styleName='{style.comment}'/>
       <g:FlowPanel ui:field='comments' visible='false'/>
     </div>
   </g:HTMLPanel>