Merge "Remove unused conds.mustache test file"