Merge "Finish drools CSIT infra"

No match.