Added fixes for the Squiz InlineCommentSniff

Also required conflict detection in the fixer because the no newline after inline comment rule conflicts with enforced newline at end of function.