Added fix for this sniff
Fix was removing the end PHP tag in some cases
Added fixes for these sniffs