Merge "Ignore CodeSniffer checks on HTML template files"