Fix PHPCS
Fix phpcs and phpdoc
Merge branch 'master' into oro/grid