Apply FunctionComment fix from PHPCS upstream

See https://github.com/squizlabs/PHP_CodeSniffer/commit/9c7db498151effd43a28f6f3e9bcdb36651dee92
Change dev dependency to PHP_CodeSniffer 2.1.0
Merge branch 'master' into in-portal

* master:
  Change dev dependency to PHP_CodeSniffer 2.1.0
  Apply FunctionComment fix from PHPCS upstream