Prevent truncating whitespace in the final line of modification.
Fixed bug #20097 : CLI.php throws error in php 5.2
Merge branch 'master' into report-memory-improvements

Conflicts:
	CodeSniffer/Reports/Junit.php
	CodeSniffer/Reports/Xml.php
	package.xml
Merge branch 'report-memory-improvements' into phpcs-fixer
Merge branch 'phpcs-fixer-spacing' of https://github.com/dereuromark/PHP_CodeSniffer into phpcs-fixer
Fixed problem stripping some member var comments and indents when fixing errors in this sniff. Needed to add a new error to get the fix working properly and make the error message more accurate.