Fix phpcs
Rename grid config files for compatilibity with OroDataGridBundle
Merge branch 'master' into oro/grid

Conflicts: