Collapse mysql OptGroup Sections

collapses two [mysql] sections into one.

Change-Id: I19317b392aa3c4d670eabbae079c6df406f0ab6f
Closes-Bug: #1302236
Merge "Collapse mysql OptGroup Sections"