Code style fixes

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
Comment that missing break statement is intended

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
Rename OptionsPropertyOneItem::$_force overwritten from parent

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
Extrace query cache total blocks value correctly

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
Add missing break in # comment detection switch

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
Add missing )

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
Merge commit '28074d2'
Merge commit 'd666ed6'
Merge commit 'daaf70b'
Merge commit '524e82e'
Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
Merge commit 'ec29a0c'