Activity matcher + checkstyle, pmd, anonymisation plugin improvements, test fixes