Fix pylint and matcher problems from merge forward
Fix another small error
Merge pull request #17698 from basepi/fixpillarcompounddevelop

Fix pylint and matcher problems from merge forward