Fix style and phpdoc
Merge branch 'master' into PIM-2498_value_form_factory