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