Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  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

Change-Id: Id89fc4ec6684396ce13acb57f925fcff53f6b06e

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

@@ -105,6 +105,8 @@ limitations under the License.
     .closed .reply {
       visibility: HIDDEN;
     }
+    .comment {
+    }
   </ui:style>
 
   <g:HTMLPanel
@@ -125,7 +127,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>