Plugin matrix: cleanup to improve maintainability
Plugin matrix: cleanup to improve maintainability

Change-Id: If5fe4d08c2bc320f4934932dceacc2494dc4a770

GerritCodeReview/homepage,GerritCodeReview/homepage,GerritCodeReview/homepage,GerritCodeReview/homepage,GerritCodeReview/homepage