Merge "Unify rally test case exclusion mechanisms"