Merge "Fix issues identified by SpaceBeforeSingleLineComment sniff"