Merge branch 'stable-2.15'

* stable-2.15:
  Fix markdown formatting on config.md

Change-Id: I8534c4f12d674cb3f2b018d8cdd553b5fce41496