Fix Bug #20381

code was treating this all as one comment
/*
block
*/
// inline
Fixed bug #20381 : Invalid "Comment closer must be on a new line"
Merge branch 'patch-1' of https://github.com/bkdotcom/PHP_CodeSniffer
Updated changelog
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
	CodeSniffer/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc
	CodeSniffer/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php