move method

code cleaning

Merge pull request #12964 from sbusch/bugfix-wrap-json-fieldname

[5.2] Wrap field name in MySQL JSON path expressions

fix formatting

fix order

fix order

Merge branch '5.1' into 5.2

Merge branch '5.1' into 5.2

Make addColumn() method public

fix conflicts